Merge branch 'master' into cde-next

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

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index 8251418836ec9f23681188dcab9a07734a24e538..c9e30dce62807fbe2ac5bd1709bb8712587ba769 100644 (file)
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -148,10 +148,8 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # endif
 #endif
 
-/* Use installed versions of Xm and X11 */
-#if OSMajorVersion >= 6
+/* Use installed X11 includes/libs */
 # define UseInstalledX11        YES
-#endif
 
 /*
  * Compiler Features
@@ -1050,8 +1048,13 @@ CXXDEPENDINCLUDE != CcCmd -v -x c++ /dev/null -fsyntax-only \
 # endif
 #endif
 
+/* Suppress warnings dependant from compiler versions */
 #if !defined(GccWarningOptions)
-# define GccWarningOptions             -Wpointer-arith -Wno-unused -Wno-write-strings -Wno-switch -Wno-unused-result
+# if (defined __clang__)
+#  define GccWarningOptions    -Wpointer-arith -Wno-unused -Wno-write-strings -Wno-switch -Wno-unused-result 
+# else
+#  define GccWarningOptions    -Wpointer-arith -Wno-unused -Wno-write-strings -Wno-switch
+# endif
 #endif
 
 #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)