linux.cf: with fds_bits fixes, stop using _POSIX_C_SOURCE=199309L and _XOPEN_SOURCE...

[oweals/cde.git] / cde / config / cf / linux.cf

diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf
index 12e848eae7d9ce488b2cb5fa1bba57759aa62509..276071bcdfe7b9134053765cab1c01ef53370595 100644 (file)
--- a/cde/config/cf/linux.cf
+++ b/cde/config/cf/linux.cf
@@ -1,10 +1,5 @@
 XCOMM platform:  $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess $
 
-/* To reduce the number of warnings generated by X11 and Motif headers that
-   dislike -ansi and -pedantic we can include them with -isystem instead of
-   -I, this tells GCC to treat them as system includes out of our control */
-#define TopXInclude -isystem$(TOP)/imports/x11/include
-
 #ifndef OSName
 # define OSName                        DefaultOSName
 #endif
@@ -39,17 +34,29 @@ XCOMM platform:  $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess $
     LinuxYggdrasil  (12)
 */
 #endif
+
+#ifndef DefaultLinuxCLibMajorVersion
+# define DefaultLinuxCLibMajorVersion    6
+#endif
+#ifndef DefaultLinuxCLibMinorVersion
+# define DefaultLinuxCLibMinorVersion    0
+#endif
+#ifndef DefaultLinuxCLibTeenyVersion
+# define DefaultLinuxCLibTeenyVersion    0
+#endif
+
 #ifndef LinuxCLibMajorVersion
-# define LinuxCLibMajorVersion   DefaultLinuxCLibMajorVersion
+# define LinuxCLibMajorVersion           DefaultLinuxCLibMajorVersion
 #endif
 #ifndef LinuxCLibMinorVersion
-# define LinuxCLibMinorVersion   DefaultLinuxCLibMinorVersion
+# define LinuxCLibMinorVersion           DefaultLinuxCLibMinorVersion
 #endif
 #ifndef LinuxCLibTeenyVersion
-# define LinuxCLibTeenyVersion   DefaultLinuxCLibTeenyVersion
+# define LinuxCLibTeenyVersion           DefaultLinuxCLibTeenyVersion
 #endif
+
 #ifndef LinuxBinUtilsMajorVersion
-# define LinuxBinUtilsMajorVersion     DefaultLinuxBinUtilsMajorVersion
+# define LinuxBinUtilsMajorVersion      DefaultLinuxBinUtilsMajorVersion
 #endif
 
 XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
@@ -65,6 +72,8 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 # endif
 #endif
 
+#define UseInstalledX11         YES
+
 #define BuildLibPathVar        LD_LIBRARY_PATH
 #define HasGcc                 YES
 #define HasGcc2                        YES
@@ -76,6 +85,17 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define HasPutenv              YES
 #define HasShm                 YES
 #define HasSockets             YES
+
+#define HasMakefileSafeInclude  YES
+#define DependFileName          .depend
+#define DependCmd               $(CC) -E -MM -MG
+
+#ifdef IncludeMakefile
+# undef IncludeMakefile
+#endif
+
+#define IncludeMakefile(file)   -include file
+
 #if (LinuxDistribution == LinuxRedHat)
 # define HasZlib               YES
 #endif
@@ -113,11 +133,13 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define LdCombineFlags         -r
 #define XawI18nDefines         -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
 #define HasWChar32             YES
-#define StandardCppDefines     -traditional StandardDefines
+#define StandardCppDefines     -traditional -nostdinc StandardDefines
 #define ExtensionOSDefines     -DXTESTEXT1
 
 #define LinuxLocaleDefines     /**/
 
+#define DefaultCCOptions        -ansi
+
 XCOMM If you have the tirpc library on your system, and you have the
 XCOMM libtirpc-dev installed, then define HasTIRPCLib to YES in either
 XCOMM your host.def or site.def file.  Using the tirpc lib should
@@ -135,7 +157,7 @@ TIRPCLIB =
 #endif
 
 #if !defined(DefaultGcc2i386Opt)
-# define DefaultGcc2i386Opt -O2 -fno-strict-aliasing
+# define DefaultGcc2i386Opt -O2 -fno-strict-aliasing -Wno-write-strings
 #endif
 
 #if LinuxCLibMajorVersion < 6
@@ -146,16 +168,15 @@ TIRPCLIB =
 # endif
 
 #else
-# define LinuxSourceDefines    -D_POSIX_C_SOURCE=199309L \
-                               -D_POSIX_SOURCE \
-                               -D_BSD_SOURCE -D_SVID_SOURCE -D_XOPEN_SOURCE \
+# define LinuxSourceDefines    -D_POSIX_SOURCE \
+                               -D_BSD_SOURCE -D_SVID_SOURCE \
                                -D__NO_STRING_INLINES -D__NO_MATH_INLINES \
                                LinuxLocaleDefines
 # define HasPosixThreads       YES
 # define ThreadedX             YES
 # define HasThreadSafeAPI      YES
 # define ThreadsLibraries      -lpthread
-# define SystemMTDefines               -D_REENTRANT
+# define SystemMTDefines       -D_REENTRANT
 # ifndef HasLibCrypt
 #  define HasLibCrypt          YES
 # endif
@@ -190,8 +211,6 @@ TIRPCLIB =
 #  define HasPlugin            YES
 #  define VendorHasX11R6_3libXext      YES     /* XC or XFree86 3.3.1 */
 # endif
-/* add this to void screenfuls of warnings from makedepend */
-# define DependFlags -I/usr/include/i386-linux-gnu
 #endif /* i386Architecture */
 
 #ifdef AMD64Architecture
@@ -204,8 +223,6 @@ TIRPCLIB =
 #  define HasPlugin            YES
 #  define VendorHasX11R6_3libXext      YES     /* XC or XFree86 3.3.1 */
 # endif
-/* add this to void screenfuls of warnings from makedepend */
-# define DependFlags -I/usr/include/x86_64-linux-gnu
 #endif /* AMD64Architecture */
 
 #ifdef PpcArchitecture
@@ -256,5 +273,5 @@ XCOMM This is needed for CDE currently
 #define TtClientLibs $(TTLIB) $(TIRPCLIB) $(XTOOLLIB) $(XLIB)
 #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 
+#include <lnxDep.rules>
 #include <lnxLib.rules>
-#include <xfree86.cf>