XFree86 4.3.0 mergeX_4_3_0-20030324-merge

1 files changed, 66 insertions, 32 deletions

diff --git a/xc/config/cf/sco5.cf b/xc/config/cf/sco5.cf
index 0014bc3c9..ca65cc080 100644
--- a/xc/config/cf/sco5.cf
+++ b/xc/config/cf/sco5.cf
@@ -1,14 +1,22 @@
-XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.9 2002/06/03 21:22:03 dawes Exp $
+XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.12 2003/02/17 18:57:46 dawes Exp $
 
 /*
- * This is for SCO Open Server 5.0.6A or later.
+ * This is for SCO Open Server 5.0.6A or later. You must have the
+ * Execution Environment update (OSS646) installed on 5.0.6 (it
+ * ships standard in 5.0.7 and later), as well as the Graphics,
+ * Web and X11 (gwxlibs) package OSS631 installed, which also ships
+ * standard with 5.0.7 and later.
+ *
+ * It is suggested that you use the GNU Development Tools for compiling
+ * XFree86. Almost no testing has been done with the native development
+ * system.
  */
 
 #ifndef OSName
 #define OSName                  UNIX System V/386 Open Server Release 5
 #endif
 #ifndef OSVendor
-#define OSVendor                Caldera
+#define OSVendor                SCO-Group
 #endif
 #ifndef OSMajorVersion
 #define OSMajorVersion          5
@@ -17,7 +25,7 @@ XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.9 2002/06/03 21:22:03 dawes Exp $
 #define OSMinorVersion          0
 #endif
 #ifndef OSTeenyVersion
-#define OSTeenyVersion          6
+#define OSTeenyVersion          7
 #endif
 
 /*
@@ -36,19 +44,26 @@ XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.9 2002/06/03 21:22:03 dawes Exp $
  * rather on a "capable curses", of which NCURSES is just one.
  */
 
-#define StandardDefines         -Dsco -DSCO -DSYSV -Di386 -DSCO325 -DFD_SETSIZE=256 -D_NO_STATIC -DMAXPATHLEN=1024
+#if 1
+#ifndef HasGcc2
+# define HasGcc2		YES
+#endif
+#ifndef HasGcc2ForCplusplus
+# define HasGcc2ForCplusplus	YES
+#endif
+#endif
+
+#define StandardDefines		-Dsco -DSCO -DSCO5 -DSYSV -Di386 -DSCO325 -DFD_SETSIZE=256 -D_NO_STATIC -DMAXPATHLEN=1024
 #ifdef HasGcc2
-# define DefaultCCOptions       -melf GccWarningOptions
-# define CcCmd                  gcc
-# define ExtraLoadOptions       -melf
-# define DefaultCDebugFlags     -O
-# define OptimizedCDebugFlags   -O
+# define DefaultCCOptions       GccWarningOptions
+# define CcCmd			gcc
+# define DefaultCDebugFlags	-O2
+# define OptimizedCDebugFlags	-O2
 #else
-# define DefaultCCOptions       -dy
-# define CcCmd                  cc
-# define ExtraLoadOptions       -b elf
-# define DefaultCDebugFlags     -O
-# define OptimizedCDebugFlags   -O
+# define DefaultCCOptions	-dy
+# define CcCmd			cc -belf
+# define DefaultCDebugFlags	-O2
+# define OptimizedCDebugFlags	-O2
 #endif
 
 #define	HasNCurses		YES
@@ -57,11 +72,11 @@ XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.9 2002/06/03 21:22:03 dawes Exp $
 #define LogDirectory		/var/adm
 
 #ifndef PexDynamicModule
-#define PexDynamicModule        NO
+#define PexDynamicModule        YES
 #endif
 
 #ifndef XieDynamicModule
-#define XieDynamicModule        NO
+#define XieDynamicModule        YES
 #endif
 
 #ifndef HasSymLinks
@@ -74,6 +89,7 @@ XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.9 2002/06/03 21:22:03 dawes Exp $
 # define SCODynamicFlags	/**/
 #endif
 
+#define AsmDefines		-D__ELF__ -D__PIC__
 #define XawI18nDefines          -DHAS_WCHAR_H -DHAS_ISW_FUNCS
 #define ServerExtraSysLibs      $(CBRT) -lm -levent SCODynamicFlags
 #define ExtraLibraries          -lsocket
@@ -86,12 +102,13 @@ XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.9 2002/06/03 21:22:03 dawes Exp $
 #define HasVFork                YES
 #define HasPutenv               YES
 #define HasSnprintf             YES
+#define HasSetenv		NO
 #define ExecableScripts         YES
 #define HasShadowPasswd         YES
-#define ManSourcePath           $(MANPATH)/cat.
+#define ManSourcePath           $(MANPATH)/man
 #define Malloc0ReturnsNull      YES
 #define RemoveDSDENroffMacros   NO
-#define CompressManPages        YES
+#define CompressManPages        NO
 
 #ifndef HasLibCrypt
 # define HasLibCrypt            YES
@@ -100,24 +117,44 @@ XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.9 2002/06/03 21:22:03 dawes Exp $
 #define PosixLibraries          /**/
 
 #ifndef ForceNormalLib
-# define ForceNormalLib         YES 
+# define ForceNormalLib         NO 
 #endif
 
-#define SharedLibXmu            NO
+#define HasExpat		YES
+#define HasFreetype2		YES
+#define HasLibpng		YES
+#define HasPerl5		YES
+#define HasDlopen		YES
+#define HasShm			YES
+#define HasStrcasecmp		YES
+#define HasZlib			YES
+#define HasFontconfig		YES
+
+#define SharedLibXmu            YES
 #define SystemV                 YES
 #define LdCombineFlags          -r 
 
 #define HasLdRunPath            YES
 #define HasPoll                 YES
-#define PatheticCpp             YES
+#define PatheticCpp		YES
 
 #define ArCmdBase               ar
-#define AsCmd                   as
-#define CppCmd                  /lib/cpp
+#define AsCmd                   CcCmd
+#define CppCmd			/lib/cpp
+#define RawCppCmd		CppCmd
 #define LdCmd                   ld
 #define LexCmd                  flex
 #define MakeCmd	                make
 #define YaccCmd                 yacc
+#define InstallCmd		/usr/gnu/bin/ginstall
+
+#ifndef UseSeparateConfDir
+#define UseSeparateConfDir	NO
+#endif
+
+#ifndef BuildHtmlManPages
+#define BuildHtmlManPages	NO
+#endif
 
 #define DefaultUserPath         /bin:/usr/bin:$(BINDIR):/usr/bin/X11:/usr/gnu/bin:/usr/local/bin:/etc
 #define DefaultSystemPath       /etc:/bin:/usr/bin:$(BINDIR):/usr/bin/X11
@@ -126,14 +163,11 @@ XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.9 2002/06/03 21:22:03 dawes Exp $
 
 #define SharedGLUReqs           $(LDPRELIB) $(XLIB) $(GLXLIB)
 
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
-install.man::                                                           @@\
-        @(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f3,4 -d.`; \     @@\
-        for i in aliases; do (set -x; \                                 @@\
-        $(RM) $(DESTDIR)destdir/$$i.*; \                                @@\
-        (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \                  @@\
-        $$i.$${SUFFIX})); \                                             @@\
-        done)
+#define ObjectFromAsmSource(src,flags)					@@\
+									@@\
+src.o: src.S								@@\
+	RemoveFile(src.o)						@@\
+	$(CC) -c AsmDefines $(DEFINES) $(INCLUDES) flags src.S
 
 #include <scoLib.rules>  /* minor changes to sv4Lib.rules */
 #include <sv4Lib.rules>