merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214

1 files changed, 80 insertions, 17 deletions

diff --git a/bsdi.cf b/bsdi.cf
index 197c7e5..ee5c51f 100644
--- a/bsdi.cf
+++ b/bsdi.cf
@@ -2,7 +2,7 @@ XCOMM platform:  $Xorg: bsdi.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
 
 
 
-XCOMM platform:  $XFree86: xc/config/cf/bsdi.cf,v 3.37 2003/04/24 22:14:53 herrb Exp $
+XCOMM platform:  $XFree86: xc/config/cf/bsdi.cf,v 3.38 2004/01/25 01:12:20 dawes Exp $
 #ifndef OSName
 #define OSName		DefaultOSName
 #endif
@@ -25,17 +25,45 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define HasDlopen		YES
 #define HasPutenv		YES
 #define HasSnprintf		YES
+#define HasMkstemp		YES
 #define HasUsableFileMmap	YES
 #define HasZlib			YES
+#define HasSetUseContext	YES
+#define HasBSDAuth		YES
+#define HasSetProcTitle		YES
+#define HasBasename		NO
+
+#if 0
+#define HasKrb5			YES
+#define Krb5Include		-I/usr/include/krb5
+#define Krb5Libraries		-lkrb5 -lk5crypto -lprofile -lcom_err
+#endif
+
+#define SharedGLUReqs		$(LDPRELIB) $(XLIB) $(GLXLIB) -lstdc++
 
 #if (OSMajorVersion == 4 && OSMinorVersion >= 1) || (OSMajorVersion > 4)
 #define HasNCurses		YES
 #else
 #define HasNCurses		NO
 #endif
+#if (OSMajorVersion == 4 && OSMinorVersion >= 3) || (OSMajorVersion > 4)
+#define HasStrlcat		YES
+#else
+#define HasStrlcat		NO
+#endif
 
 #define BuildLBX		YES
-#define GzipFontCompression	NO
+#define GzipFontCompression	YES
+#define BuildXaw6		NO
+
+XCOMM BSD/OS 5.1 (intel) comes with gcc 3.2.2 installed as gcc and cc.
+
+XCOMM BSD/OS 5.0 (intel) comes with gcc 2.95.3 installed as gcc and cc.
+
+XCOMM BSD/OS 4.3/4.3.1 (intel) comes with gcc 2.95.3 installed as gcc and cc.
+
+XCOMM BSD/OS 4.2 (intel) comes with gcc 2.95.2 installed as gcc and cc.
+XCOMM BSD/OS 4.2 (sparc) comes with gcc 2.95.2 installed as gcc and cc.
 
 XCOMM BSD/OS 4.1 (intel) comes with gcc 2.91.66 installed as gcc and cc.
 XCOMM BSD/OS 4.1 (sparc) comes with gcc 2.95.2 installed as gcc and cc.
@@ -78,11 +106,21 @@ XCOMM xf86site.def
 # ifdef i386Architecture
 #  define CcCmd			gcc /* shlicc */
 #  define CplusplusCmd		g++ /* shlicc++ */
-#  define OptimizedCDebugFlags	-O2 -m486
-# else
+#  if ((OSMajorVersion == 4 && OSMinorVersion >= 2) || (OSMajorVersion > 4))
+#   define OptimizedCDebugFlags	-O3 -mcpu=pentiumpro -march=pentium
+#  else
+#   define OptimizedCDebugFlags	-O2 -m486
+#  endif
+# endif
+# ifdef PpcArchitecture
 #  define CcCmd			gcc
 #  define CplusplusCmd		g++
-#  define OptimizedCDebugFlags	-O4 -mv8
+#  define OptimizedCDebugFlags	-O2
+# endif
+# ifdef SparcArchitecture
+#  define CcCmd			gcc
+#  define CplusplusCmd		g++
+#  define OptimizedCDebugFlags	-O2 -cpu=v8 -mtune=v8
 # endif
 #else
 # define CcCmd			cc
@@ -90,9 +128,9 @@ XCOMM xf86site.def
 #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 && OSMinorVersion == 2)
+#if ((OSMajorVersion == 4 && OSMinorVersion >= 2) || (OSMajorVersion > 4))
 #define GccOptBug295
 #endif
 
@@ -128,19 +166,25 @@ XCOMM xf86site.def
 #endif
 
 /*
- * Build a threaded X server on 4.1 and newer systems
+ * Build a threaded X server on BSD/OS 4.1 and newer releases
  */
 #if (OSMajorVersion == 4 && OSMinorVersion >= 1) || (OSMajorVersion > 4)
 #define HasPosixThreads         YES     /* this will autodefine HasThreadedX */
 #define HasThreadSafeAPI        YES
-XCOMM math.h uses _REENTRANT in FreeBSD, so we define it here too
-#define SystemMTDefines         -D_REENTRANT -D_THREAD_SAFE
 /*
  * Heck, build a server that can load modules too...
  */
-#define DoLoadableServer        YES
+#define DoLoadableServer        Yes
 #endif
 
+XCOMM math.h uses _REENTRANT in FreeBSD, so we define it here too
+#if (OSMajorVersion >= 5)
+#define SystemMTDefines         -D_REENTRANT -D_THREAD_SAFE -D_POSIX_THREAD_SAFE_FUNCTIONS
+#elif (OSMajorVersion == 4 && OSMinorVersion >= 1)
+#define SystemMTDefines         -D_REENTRANT -D_THREAD_SAFE
+#endif
+
+
 #ifdef i386Architecture
 #ifndef BuildXF86DRI
 #define BuildXF86DRI            NO
@@ -148,10 +192,21 @@ XCOMM math.h uses _REENTRANT in FreeBSD, so we define it here too
 #endif
 
 #ifdef i386Architecture
+# define HasTk			YES
+# define TkLibName		tk4.2
+# define TkLibDir		/usr/contrib/lib
+# define TkIncDir		/usr/include
+# define XF86SetupUsesStaticTk	NO
+# define HasTcl			YES
+# define TclLibName		tcl7.6
+# define TclLibDir		/usr/contrib/lib
+# define TclIncDir		/usr/include
+# define XF86SetupUsesStaticTcl	NO
+# define SharedLibXv		YES
+# define SharedLibXinerama	YES
 # define ServerExtraDefines GccGasOption XFree86ServerDefines -I/sys
 # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-# define XFree86ConsoleDefines /**/
-# define AsmDefines -DUSE_GAS
+# define XFree86ConsoleDefines	-DBSDI_VT
 # if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 1)
 #  include <bsdiLib.rules>
 #  define DontUseLibPathVar
@@ -159,6 +214,18 @@ XCOMM math.h uses _REENTRANT in FreeBSD, so we define it here too
 #  define ServerCcCmd         cc
 #  define ServerExtraSysLibs  DlLibrary
 # endif
+# define XConfigDir /etc/X11
+#endif
+
+#ifdef PpcArchitecture
+# define BuildServer		NO
+# define BuildFonts		NO
+# define XConfigDir /etc/X11
+# include <bsdiLib.rules>
+# define DontUseLibPathVar
+# define BuildDynamicLoading	YES
+# define ServerCcCmd		cc
+# define ServerExtraSysLibs	DlLibrary
 #endif
 
 #ifdef SparcArchitecture
@@ -166,10 +233,6 @@ XCOMM math.h uses _REENTRANT in FreeBSD, so we define it here too
 # define ServerOSDefines   -DDDXOSINIT
 #endif
 
-#ifdef PpcArchitecture
-# define BuildServer		NO
-#endif
-
 #define HasShm			YES
 #define AsmDefines -DUSE_GAS