Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code

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

diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf
index c7975365c912a368fe25a869c24ed861844776bc..07edc5693d5e4f324bfd423dea18df0e9803ffd6 100644 (file)
--- a/cde/config/cf/linux.cf
+++ b/cde/config/cf/linux.cf
@@ -56,6 +56,7 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define UseElfFormat           YES
 #else
 #define UseElfFormat           NO
+#error "Only ELF format is supported on linux"
 #endif
 #endif
 #define BuildLibPathVar        LD_LIBRARY_PATH
@@ -65,7 +66,7 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define GccUsesGas             YES
 #define UseGas                 YES
 #define GnuCpp                 YES
-#define HasShadowPasswd                NO
+#define HasShadowPasswd                YES
 #define HasPutenv              YES
 #define HasShm                 YES
 #define HasSockets             YES
@@ -84,30 +85,14 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define NeedWidePrototypes     NO
 #define SetTtyGroup            YES
 
-#if UseElfFormat
-#if OSMajorVersion == 1 && OSMinorVersion < 2
-#define CcCmd                  gcc -b i486-linuxelf
-#define CplusplusCmd           g++ -b i486-linuxelf
-#define AsCmd                  /usr/i486-linuxelf/bin/as
-#define LdCmd                  ld -m elf_i386
-#else
-#define CcCmd                  gcc
-#define CplusplusCmd           g++
+#define CcCmd                  gcc -g -pipe
+#define CplusplusCmd           g++ -g -pipe -fpermissive 
 #define AsCmd                  as
 #define LdCmd                  ld
-#endif
+
+#define CplusplusLibC           -lstdc++
 #define AsmDefines             -D__ELF__
-#else
-#define CcCmd                  gcc
-#if OSMajorVersion == 1 && OSMinorVersion > 1
-#define AsCmd                  /usr/i486-linuxaout/bin/as
-#define LdCmd                  ld -m i386linux
-#else
-#define AsCmd                  as
-#define LdCmd                  ld
-#endif
-#define AsmDefines             -DUSE_GAS -U__ELF__
-#endif
+
 #define MkdirHierCmd           mkdir -p
 #define CppCmd                 /lib/cpp
 #if OSMajorVersion >= 2
@@ -125,66 +110,88 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define StandardCppDefines     -traditional StandardDefines
 #define ExtensionOSDefines     -DXTESTEXT1
 
-#if (LinuxDistribution == LinuxSuSE)
 #define LinuxLocaleDefines     /**/
-#else
-#define LinuxLocaleDefines     -DX_LOCALE
-#endif
 
 #if LinuxCLibMajorVersion < 6
-#define LinuxSourceDefines     -D_POSIX_SOURCE \
+# define LinuxSourceDefines    -D_POSIX_SOURCE \
                                -D_BSD_SOURCE -D_SVID_SOURCE LinuxLocaleDefines
-#ifndef HasLibCrypt
-# define HasLibCrypt           NO
-#endif
+# ifndef HasLibCrypt
+#  define HasLibCrypt          NO
+# endif
+
 #else
-#define LinuxSourceDefines     -D_POSIX_C_SOURCE=199309L \
+# define LinuxSourceDefines    -D_POSIX_C_SOURCE=199309L \
                                -D_POSIX_SOURCE \
-                               -D_BSD_SOURCE -D_SVID_SOURCE
-#define HasPosixThreads                YES
-#define ThreadedX              YES
-#define HasThreadSafeAPI       YES
-#define ThreadsLibraries       -lpthread
-#define SystemMTDefines                -D_REENTRANT
-#ifndef HasLibCrypt
-# define HasLibCrypt           YES
-#endif
-#endif
+                               -D_BSD_SOURCE -D_SVID_SOURCE -D_XOPEN_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
+# ifndef HasLibCrypt
+#  define HasLibCrypt          YES
+# endif
+#endif
+
+#ifdef ARMArchitecture
+#define LinuxMachineDefines -D__arm__
+#define LSBBitOrder             YES
 
-#define LinuxMachineDefines
+#if UseElfFormat
+#define HasPlugin               YES
+#define VendorHasX11R6_3libXext YES     /* XC or XFree86 3.3.1 */
+#endif 
+#endif /* ARMArchitecture */
 
-#if 0
 #ifdef i386Architecture
 #define OptimizedCDebugFlags   DefaultGcc2i386Opt
 #define LinuxMachineDefines    -D__i386__
-#define ServerOSDefines                XFree86ServerOSDefines -DDDXTIME
-#define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
+/* For DtHelp TIFF processing routines. */
+#define LSBBitOrder             YES
+
 #if UseElfFormat
 #define HasPlugin              YES
 #define VendorHasX11R6_3libXext        YES     /* XC or XFree86 3.3.1 */
 #endif
 #endif /* i386Architecture */
 
+#ifdef AMD64Architecture
+#define OptimizedCDebugFlags   DefaultGcc2i386Opt
+#define LinuxMachineDefines    -D__x86_64__ 
+/* For DtHelp TIFF processing routines. */
+#define LSBBitOrder             YES
+
+#if UseElfFormat
+#define HasPlugin              YES
+#define VendorHasX11R6_3libXext        YES     /* XC or XFree86 3.3.1 */
+#endif
+#endif /* AMD64Architecture */
+
+#ifdef PpcArchitecture
+#define OptimizedCDebugFlags    -O2
+#define LinuxMachineDefines     -D__powerpc__
+#endif /* PpcArchitecture */
+
 #ifdef AlphaArchitecture
 #define OptimizedCDebugFlags   -O2
 #define LinuxMachineDefines    -D__alpha__
-#define ServerOSDefines                XFree86ServerOSDefines -DDDXTIME -DPART_NET
-#define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
 #endif /* AlphaArchitecture */
 
 #ifdef Mc68020Architecture
 #define OptimizedCDebugFlags   -O2
 #define LinuxMachineDefines    -D__mc68000__
-#define StandardCppDefines      -traditional StandardDefines
-#define ServerOSDefines         XFree86ServerOSDefines -DDDXTIME -DPART_NET
-#define ServerExtraDefines      -DGCCUSESGAS XFree86ServerDefines
+#define StandardCppDefines      -traditional 
 #endif /* Mc68020Architecture */
-#endif /* 0 */
 
 #define StandardDefines                -Dlinux LinuxMachineDefines LinuxSourceDefines
 
 #define ConnectionFlags                -DUNIXCONN -DTCPCONN
 
+XCOMM This is needed for CDE currently
+#define CplusplusStandardDefines StandardDefines 
+
 /* Some of these man page defaults are overriden in the above OS sections */
 #ifndef ManSuffix
 # define ManSuffix     1x