From: Jon Trulson <jon@radscan.com>
Date: Thu, 14 Jun 2018 18:59:21 +0000 (-0600)
Subject: OpenBSD 6+: use installed X11 and Motif
X-Git-Tag: 2.3.0~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=59b83865ef48b7cbaa8b4ee5870eed10133b2762;p=oweals%2Fcde.git

OpenBSD 6+: use installed X11 and Motif

This commit removes the need to setup X11 and motif import symlinks
before building CDE.  With OpenBSD v6+, the installed versions of X11 and
Motif will be used.

This may work with earlier versions of OpenBSD as well, but I don't
have access to those older versions.  If you try it, and it works,
send a patch to the CDE mailing list.

This was tested on OpenBSD 6.2
---

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index d2b17189..6f1310d7 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -148,6 +148,11 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # endif
 #endif
 
+/* Use installed versions of Xm and X11 */
+#if OSMajorVersion >= 6
+# define UseInstalledX11        YES
+#endif
+
 /*
  * Compiler Features
  */
diff --git a/cde/config/imake/Makefile.ini b/cde/config/imake/Makefile.ini
index 30e311c0..f05a17de 100644
--- a/cde/config/imake/Makefile.ini
+++ b/cde/config/imake/Makefile.ini
@@ -11,7 +11,7 @@
 BOOTSTRAPCFLAGS = 
 CC = cc
 CDEBUGFLAGS = -O
-INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 -I../../imports/x11/include/X11
+INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I../../imports/x11/include/X11
 CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES)
 SHELL = /bin/sh
 RM = rm -f