Clean up UseInstalledX11 logic

diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index 34528bb1fd47e7ac75611e403428ed653f77b51f..b77e31bfe9517ba081c669ccb1196e11d3fe9d2c 100644 (file)
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -73,9 +73,6 @@ USE_GCC = UseGcc
 # define HasGcc2               YES
 #endif
 
-/* Use installed X11 includes/libs */
-#define UseInstalledX11         YES
-
 /* For DtHelp TIFF processing routines. */
 #ifdef AMD64Architecture
 #define LSBBitOrder             YES

diff --git a/cde/config/cf/NetBSD.cf b/cde/config/cf/NetBSD.cf
index b5861ea4a81e69a2cbfe4b654aec10dec8c30480..7d0cc593ff9d8dd80a44909665bbbe4208b797d7 100644 (file)
--- a/cde/config/cf/NetBSD.cf
+++ b/cde/config/cf/NetBSD.cf
@@ -106,9 +106,6 @@ XCOMM operating system:  OSName
 #define GccGasOption           -DGCCUSESGAS
 #define AsmDefines             -DUSE_GAS
 
-/* Use installed X11 includes/libs */
-#define UseInstalledX11         YES
-
 #ifdef i386Architecture
 # ifndef OptimizedCDebugFlags
 #  define OptimizedCDebugFlags         -O2 -fno-strict-aliasing

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index c9e30dce62807fbe2ac5bd1709bb8712587ba769..2d912018160a0c71f313f9f883f7253d95f1507b 100644 (file)
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -148,9 +148,6 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # endif
 #endif
 
-/* Use installed X11 includes/libs */
-# define UseInstalledX11        YES
-
 /*
  * Compiler Features
  */

diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf
index bca21fb290f412d1504670987c8708e9a47fc417..bfe2c0be1b1750a59301532ca21954b51fb61f0c 100644 (file)
--- a/cde/config/cf/linux.cf
+++ b/cde/config/cf/linux.cf
@@ -72,8 +72,6 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 # endif
 #endif
 
-#define UseInstalledX11         YES
-
 #define BuildLibPathVar                LD_LIBRARY_PATH
 #define HasGcc                 YES
 #define HasGcc2                        YES

diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index eb7f343840b757a9cd1f7bef387925b6e059d3a5..da9179a0e737bf217e309d1ba809f0235d7e3497 100644 (file)
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -21,10 +21,8 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 /* CDE uses a .C suffix for C++ source, not the default .cxx */
 # define CCsuf                 C
 
-/* We will import x11. */
-# define ImportX11             YES
-
-/* We will use installed Motif. */
+/* We will use installed x11 and Motif. */
+# define UseInstalledX11       YES
 # define UseInstalledMotif     YES
 
 # ifndef TopLevelProject

diff --git a/cde/config/cf/sun.cf b/cde/config/cf/sun.cf
index 05dc2cc17c5119c339dfc90714205ff7f2101706..4ce766b7c575cfc75738d60fb416073bea7eb0a5 100644 (file)
--- a/cde/config/cf/sun.cf
+++ b/cde/config/cf/sun.cf
@@ -376,9 +376,6 @@ man_keywords::                                                              @@\
 #define DependDefines          -D__BUILTIN_VA_ARG_INCR
 #endif
 
-/* Use installed X11 includes/libs */
-#define UseInstalledX11                YES
-
 #define LdPreLib               -L$(BUILDLIBDIR)
 #define PamUnixDefines         -DPAM_NIS
 #define TtLargePICTable                YES