Fixes for OpenBSD

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

diff --git a/cde/config/cf/sun.cf b/cde/config/cf/sun.cf
index 9b646a8adb91d263647cd8a1ec304fb6e7d94a58..956da3ff05e6649d9595081995a99b8b288ec361 100644 (file)
--- a/cde/config/cf/sun.cf
+++ b/cde/config/cf/sun.cf
@@ -178,9 +178,12 @@ XCOMM Gnu C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #ifndef CplusplusLibC
 #define CplusplusLibC          -L/opt/solarisstudio/lib -lCrun
 #endif
+#ifndef OptimizedCplusplusDebugFlags
+# define OptimizedCplusplusDebugFlags  -O2 -erroff=attrskipunsup
+#endif
 #ifndef  CplusplusDependIncludes
 #if CplusplusCompilerMajorVersion > 3
-# define CplusplusDependIncludes       -I/opt/solarisstudio/prod/include/CC -I/opt/solarisstudio/prod/include/CC/Cstd
+# define CplusplusDependIncludes       -I/opt/solarisstudio/prod/include/CC -I/opt/solarisstudio/prod/include/CC/Cstd -I/opt/solarisstudio/prod/include/CC/std
 #elif CplusplusCompilerMajorVersion > 2
 # define CplusplusDependIncludes       -I/opt/SUNWspro/SC3.0/include/CC
 #else
@@ -205,11 +208,14 @@ XCOMM Gnu C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 # elif OSMinorVersion > 3
 #  define InstallCmd       /usr/ucb/install
 # endif
-# ifdef i386Architecture
-#  define StandardDefines        -Dsun -Di386 -DSVR4 -D__i386
+# if defined(i386Architecture)
+#  define StandardDefines              -Dsun -Di386 -DSVR4 -D__i386
 #  define ToolkitStringsABIOptions     -intelabi
+# elif defined(SparcArchitecture)
+#  define StandardDefines              -Dsun -Dsparc -DSVR4 -D__sparc
+#  define ToolkitStringsABIOptions     -sparcabi
 # else
-#  define StandardDefines        -Dsun -DSVR4
+#  define StandardDefines              -Dsun -DSVR4
 #  define ToolkitStringsABIOptions     -sparcabi
 # endif
 # define ExtraLibraries    -lsocket -lnsl
@@ -279,7 +285,7 @@ XCOMM Gnu C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 # if HasGcc2
 #  define SharedLibraryLoadFlags -shared
 #  define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-#  ifdef i386Architecture
+#  if defined(i386Architecture) || defined(SparcArchitecture)
 #   define CcCmd               gcc
 #  endif
 # else
@@ -375,6 +381,10 @@ man_keywords::                                                             @@\
 #define DtWidgetDefines                DtSearchDefines
 #define DtPrintDefines         DtSearchDefines
 
+#ifndef CompressAllFonts
+#define CompressAllFonts       YES
+#endif
+
 /* For DtHelp TIFF processing routines. */
 #if defined(AMD64Architecture) || defined(i386Architecture)
 #define LSBBitOrder             YES