Clean up UseInstalledX11 logic

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

diff --git a/cde/config/cf/sun.cf b/cde/config/cf/sun.cf
index 4c53beba8f56f2349720b4d11c4ce2c7f26da303..4ce766b7c575cfc75738d60fb416073bea7eb0a5 100644 (file)
--- a/cde/config/cf/sun.cf
+++ b/cde/config/cf/sun.cf
@@ -29,8 +29,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
  *    configuration varibles used here.
  * 
  * If you don't tell us which C compiler you have, we assume you have 
- * the Gcc C compiler under Solaris 5.x.
- * under SunOS 4.1.x
+ * the Gcc C compiler under Solaris 2.x.
  *
  * === C++ Compiler Setup ==========================================
  *
@@ -43,8 +42,8 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
  * In any case, you may also need to set CplusplusDependIncludes.
  *
  * If you say you have the SunPro C++ compiler, we assume you have 
- * version 5.0.x of the compiler.  If you have version 4.0.x instead,
- * define CplusplusCompilerMajorVersion as 4 in host.def.
+ * version 5.0.x of the compiler.  If you have an earlier version
+ * instead, define CplusplusCompilerMajorVersion in host.def.
  *
  */
 
@@ -178,9 +177,14 @@ 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
+#if CplusplusCompilerMajorVersion > 4
+# define CplusplusDependIncludes       -I/opt/solarisstudio/prod/include/CC -I/opt/solarisstudio/prod/include/CC/Cstd -I/opt/solarisstudio/prod/include/CC/std
+#elif CplusplusCompilerMajorVersion > 3
+# define CplusplusDependIncludes       -I/opt/SUNWspro/SC4.0/include/CC
 #elif CplusplusCompilerMajorVersion > 2
 # define CplusplusDependIncludes       -I/opt/SUNWspro/SC3.0/include/CC
 #else
@@ -365,12 +369,14 @@ man_keywords::                                                            @@\
 #define SharedXdmcpRev 6
 #endif
 
+#define HasMakefileSafeInclude YES
+#define IncludeMakefile(file)  HASH_SIGN dependencies are in .depend
 #define DependFileName         .depend
 #if HasSunC
 #define DependDefines          -D__BUILTIN_VA_ARG_INCR
 #endif
 
-#define LdPreLib               -L/usr/X11/lib -L$(BUILDLIBDIR)
+#define LdPreLib               -L$(BUILDLIBDIR)
 #define PamUnixDefines         -DPAM_NIS
 #define TtLargePICTable                YES
 #define DtSvcDefines           -DMULTIBYTE -DNO_REGCOMP
@@ -400,7 +406,7 @@ man_keywords::                                                              @@\
 #define TtClientExtraLibs      ExtraLibraries -ldl -lintl
 
 #ifndef TopMotifInclude
-# define TopMotifInclude       /usr/X11/include
+# define TopMotifInclude       $(MPROJECTROOT)/include
 #endif
 
 #define ShlibExportListOpt(filename)   -M filename