#ifndef OSTeenyVersion
#define OSTeenyVersion DefaultOSTeenyVersion
#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
+XCOMM operating system: OSName (OSMajorVersion/**/./**/OSMinorVersion/**/./**/OSTeenyVersion)
#define HasPutenv YES
#define HasBSD44Sockets YES
#define HasZlib YES
+#define HasXdmAuth YES
-#if OSMajorVersion >= 5
-#define CppCmd /usr/bin/cpp -traditional
-#define PreProcessCmd /usr/bin/cpp -traditional
+#if OSMajorVersion >= 10 && defined(UseGcc)
+USE_GCC = UseGcc
+#endif
+
+#ifndef CppCmd
+#if OSMajorVersion >= 10 && defined(UseGcc)
+# define CppCmd /usr/local/bin/cpp$(USE_GCC)
#else
-#define CppCmd /usr/libexec/cpp -traditional
-#define PreProcessCmd /usr/libexec/cpp -traditional
+# define CppCmd /usr/bin/cpp
+#endif
+#endif
+#define PreProcessCmd CppCmd
+
+#if OSMajorVersion >= 10
+#define CppArgs -Wno-invalid-pp-token
+#define DirFailPrefix -
+#else
+#define CppArgs /**/
+#endif
+
+#ifndef StandardCppDefines
+#define StandardCppDefines -traditional CppArgs
+#endif
+
+#ifndef PerlCmd
+#define PerlCmd /usr/local/bin/perl
#endif
#undef InstallCmd
#define InstallCmd /usr/bin/install
# define HasGcc2 YES
#endif
+/* For DtHelp TIFF processing routines. */
+#ifdef AMD64Architecture
+#define LSBBitOrder YES
+#endif
+
+#ifdef ARMArchitecture
+#define LSBBitOrder YES
+#endif
+
+#ifdef i386Architecture
+#define LSBBitOrder YES
+#endif
+
#define MkdirHierCmd mkdir -p
-#define CcCmd gcc
+#ifndef CcCmd
+#if OSMajorVersion >= 10
+# if defined(UseGcc)
+# define CcCmd /usr/local/bin/gcc$(USE_GCC)
+# define CplusplusCmd /usr/local/bin/g++$(USE_GCC)
+# else
+# define CcCmd cc
+# define CplusplusCmd c++
+# endif
+#else
+# define CcCmd gcc
+# define CplusplusCmd g++
+#endif
+#endif
+
#ifndef DefaultCCOptions
#define DefaultCCOptions -pipe
#endif
+#ifndef CplusplusLibC
#define CplusplusLibC -lstdc++
+#endif
#if OSMajorVersion > 1
#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
#define XawI18nDefines -DUSE_XWCHAR_STRING
#define HasMakefileSafeInclude YES
-#define IncludeMakefile(file) @@# dependencies are in .depend
+#define IncludeMakefile(file) HASH_SIGN dependencies are in .depend
#define DependFileName .depend
+#define DependDefines -D__cplusplus
#if OSMajorVersion < 3
#if OSMinorVersion < 2
#ifndef ExtraLibraries
/* 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 -O2
+#define DefaultGcc2i386Opt -O2 -fno-strict-aliasing
#endif
#endif
-#ifdef i386Architecture
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-#else
-# define OptimizedCDebugFlags -O2
+#ifndef OptimizedCDebugFlags
+# if defined(i386Architecture) || defined(AMD64Architecture)
+# define OptimizedCDebugFlags DefaultGcc2i386Opt
+# else
+# define OptimizedCDebugFlags -O2 -fno-strict-aliasing
+# endif
+#endif
+
+#ifdef HasGcc2
+CXXDEPENDINCLUDE != CcCmd -v -x c++ /dev/null -fsyntax-only \
+ 2>&1 | sed -n 's/^ \(\/.*[cg]++.*\)/-I\1/p'
+#define CplusplusDependIncludes $(CXXDEPENDINCLUDE)
+#endif
+
+/* beginning with svn version 254273 iconv functions are moved to libc */
+#if (OSMajorVersion >= 10)
+ICONVSYSLIB != if test -f /usr/local/include/iconv.h; then echo -liconv; else echo; fi
#endif
#define ServerExtraDefines GccGasOption XFree86ServerDefines
#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
#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>