diff options
Diffstat (limited to 'xc/config/cf/FreeBSD.cf')
| -rw-r--r-- | xc/config/cf/FreeBSD.cf | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/xc/config/cf/FreeBSD.cf b/xc/config/cf/FreeBSD.cf index bd110ceaf..24c054c0a 100644 --- a/xc/config/cf/FreeBSD.cf +++ b/xc/config/cf/FreeBSD.cf @@ -2,7 +2,7 @@ XCOMM platform: $Xorg: FreeBSD.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ XCOMM XCOMM XCOMM -XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.121 2002/09/12 17:23:53 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.128 2003/01/15 02:52:12 dawes Exp $ #ifndef UseElfFormat #define UseElfFormat DefaultToElfFormat @@ -43,7 +43,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define GccUsesGas YES #define UseGas YES #define GnuCpp YES -#define HasPoll YES #define HasNdbm YES #define HasPutenv YES #define HasSnprintf YES @@ -66,6 +65,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #if (OSMajorVersion >= 3) #define HasIssetugid YES +#define HasPoll YES #endif #if OSMajorVersion >= 4 @@ -98,8 +98,13 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe # if HasLibPthread # define ThreadsLibraries -lpthread # else -# define BuildThreadStubLibrary YES -# define NeedUIThrStubs YES +# if OSRelVersion >= 500043 +# define BuildThreadStubLibrary NO +# define NeedUIThrStubs NO +# else +# define BuildThreadStubLibrary YES +# define NeedUIThrStubs YES +# endif # if (OSRelVersion >= 500016) # define ThreadsLibraries -lc_r # else @@ -156,7 +161,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe * * ld: warning: libXThrStub.so.6, needed by libX11.so, not found */ -#if BuildThreadStubLibrary && !UseInstalledX11 +#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) # define CcCmd $(CLIENTENVSETUP) cc # define CplusplusCmd $(CLIENTENVSETUP) c++ #else @@ -233,18 +238,20 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #endif /* - * Katmai (SSE) and 3DNow will be autodetected, so binutils is the only + * SSE and 3DNow will be autodetected, so binutils is the only * requirement for enabling this. By 4.2 they were all supported. */ -#ifdef i386Architecture && \ - (OSMajorVersion >= 5) || (OSMajorVersion == 4 && OSMinorVersion >= 2)) +#if defined(i386Architecture) && \ + (OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 2)) +# define HasX86Support YES # define HasMMXSupport YES # define Has3DNowSupport YES -# define HasKatmaiSupport YES +# define HasSSESupport YES #else +# define HasX86Support NO # define HasMMXSupport NO # define Has3DNowSupport NO -# define HasKatmaiSupport NO +# define HasSSESupport NO #endif /* @@ -451,6 +458,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #ifdef AlphaArchitecture #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 #endif +#ifdef Sparc64Architecture +#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64 +#endif #define StandardDefines -DCSRG_BASED @@ -538,6 +548,10 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define PamLibraries -lpam DlLibrary #endif +#ifndef SharedLibXdmGreet +# define SharedLibXdmGreet NO +#endif + /* * On FreeBSD, the run-time loader will use the built-in "rpath" before * LD_LIBRARY_PATH. This means that utilities like mkfontdir will load @@ -569,7 +583,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #endif /* - * A hack to work around an optimization problem with gcc 2.95.2 + * A hack to work around an optimization problem with gcc 2.95.2 - 2.95.4 */ #if OSMajorVersion == 4 #define GccOptBug295 |