Revert "Enable the use of the TIRPC library on Linux."

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

diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index 1a300642b09a6a5ed2b3eba7a3f3e2bf73081970..e57082bae56a590d803efeb972c0a674f1b25109 100644 (file)
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -138,14 +138,20 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
 #ifndef DefaultGcc2i386Opt
 #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
-#define DefaultGcc2i386Opt -O
+#define DefaultGcc2i386Opt -O2 -fno-strict-aliasing
 #endif
 #endif
 
 #ifdef i386Architecture
 # define OptimizedCDebugFlags DefaultGcc2i386Opt
 #else
-# define OptimizedCDebugFlags -O
+# define OptimizedCDebugFlags -O2 -fno-strict-aliasing
+#endif
+
+#ifdef HasGcc2
+CXXDEPENDINCLUDE != CppCmd -x c++ -Wp,-v < /dev/null \
+                   2>&1 | sed -n 's/ \(.*[cg]++.*\)/-I\1/p'
+#define CplusplusDependIncludes        $(CXXDEPENDINCLUDE)
 #endif
 
 #define ServerExtraDefines     GccGasOption XFree86ServerDefines
@@ -154,6 +160,9 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define StandardIncludes       -I/usr/local/include
 #define BuildLibPathVar                LD_LIBRARY_PATH
 
+#define DefaultUserPath                /bin:/usr/bin:/usr/local/bin:$(BINDIR)
+#define DefaultSystemPath      /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
+
 #define TroffCmd               groff -Tps
 #define SetTtyGroup            YES
 #define HasNdbm                        YES
@@ -167,8 +176,6 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define HasPlugin              YES
 #define VendorHasX11R6_3libXext        YES     /* XC or XFree86 3.3.1 */
 
-#include <bsdLib.rules>
+#define CDESharedRev           2
 
-#ifdef i386Architecture
-#include <xfree86.cf>
-#endif
+#include <bsdLib.rules>