diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-07-17 22:17:24 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-07-17 22:17:24 +0000 |
| commit | 965c266bf6f0b59541c73eceefb5a26f2246b456 (patch) | |
| tree | 17d63ff1b19707529964727c268f3e78e9df8836 /FreeBSD.cf | |
| parent | f54e0f2e574341e0c032a2043bcab6910af4a4c1 (diff) | |
- Default to assuming that ports that can be built without the xorg pieces
being installed are installed before the xorg build begins. #define
HasStandardPorts NO can turn this behavior off. Also fixes some
freetype issues related to it looking in the wrong place.
- While here, remove some unnecessary #if nesting in threads.
Diffstat (limited to 'FreeBSD.cf')
| -rw-r--r-- | FreeBSD.cf | 43 |
1 files changed, 36 insertions, 7 deletions
@@ -1,5 +1,5 @@ XCOMM platform: $Xorg: FreeBSD.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ -XCOMM platform: $XdotOrg: xc/config/cf/FreeBSD.cf,v 1.5 2004/07/04 22:49:49 anholt Exp $ +XCOMM platform: $XdotOrg: xc/config/cf/FreeBSD.cf,v 1.6 2004/07/17 21:16:17 anholt Exp $ XCOMM XCOMM XCOMM @@ -119,12 +119,10 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe # endif # if (OSRelVersion >= 502102) # define ThreadsLibraries -lpthread +# elif (OSRelVersion >= 500016) +# define ThreadsLibraries -lc_r # else -# if (OSRelVersion >= 500016) -# define ThreadsLibraries -lc_r -# else -# define ThreadsLibraries -pthread -# endif +# define ThreadsLibraries -pthread # endif # define SystemMTDefines -D_THREAD_SAFE #endif @@ -376,15 +374,46 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #endif #endif +/* There are two options for building. One is to assume that the system has + * many of the dependencies provided by the ports tree. The other is to just + * build everything from this tree. + */ + +#ifndef HasStandardPorts +#define HasStandardPorts YES +#endif + +#ifndef LocalBase +#define LocalBase /usr/local +#endif +#ifndef X11Base +#define X11Base /usr/X11R6 +#endif + +#if HasStandardPorts + #ifndef HasExpat # define HasExpat YES -# define ExpatDir /usr/local +# define ExpatDir LocalBase #endif #ifndef HasFreetype2 # define HasFreetype2 YES +# define Freetype2Dir LocalBase +#endif + +#ifndef HasFontconfig +# define HasFontconfig YES +# define FontconfigDir X11Base #endif +#ifndef HasLibpng +# define HasLibpng YES +# define LibpngDir LocalBase +#endif + +#endif /* HasStandardPorts */ + #undef InstallCmd #define InstallCmd /usr/bin/install |