FreeBSD 11: Don't use imported x11/motif, use installed versions for build

With this patch, the import symlinks for x11 and motif do not need to
be created.  The build will use the installed headers in
/usr/local/include/{X11, Xm}.

This will work for FreeBSD 11 only ATM as I don't have older systems
to test with.

It may work for FreeBSD 10 or earlier versions as well.  If so, edit
config/cf/FreeBSD.cf and change the OSMajorVersion check for
UseInstalledX11 appropriately.  And send a patch to the CDE mailing
list :)

diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index b25e9a6003f8e825eb9abeb3009248c1c00843bd..1b56256b48e0fd957126bd32a2eba081876b7dbe 100644 (file)
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -73,6 +73,12 @@ USE_GCC = UseGcc
 # define HasGcc2               YES
 #endif
 
+/* Use installed X11 includes/libs on FreeBSD 11+ */
+#if (OSMajorVersion >= 11)
+#define UseInstalledX11         YES
+#endif
+
+
 /* For DtHelp TIFF processing routines. */
 #ifdef AMD64Architecture
 #define LSBBitOrder             YES

diff --git a/cde/config/imake/Makefile.ini b/cde/config/imake/Makefile.ini
index 6c93094fc5c067aa0d49a591cc0043e848989566..30e311c0800ca515df04a42578d19e08ed0e5fb2 100644 (file)
--- 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/include/X11 -I../../imports/x11/include/X11
+INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 -I../../imports/x11/include/X11
 CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES)
 SHELL = /bin/sh
 RM = rm -f