This just cleans up the UseInstalledX11 logic. It flips the existing master toggle in site.def instead of overriding it for each platform.
-mrt
>From d19bfde88ea2d8f5e4c9fb201bbe9764c13de1b8 Mon Sep 17 00:00:00 2001 From: "Matthew R. Trower" <d...@blackshard.net> Date: Thu, 25 Oct 2018 05:38:28 -0500 Subject: [PATCH] Clean up x11 header logic --- cde/config/cf/FreeBSD.cf | 3 --- cde/config/cf/NetBSD.cf | 3 --- cde/config/cf/OpenBSD.cf | 3 --- cde/config/cf/linux.cf | 2 -- cde/config/cf/site.def | 6 ++---- cde/config/cf/sun.cf | 3 --- 6 files changed, 2 insertions(+), 18 deletions(-) diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf index 34528bb1..b77e31bf 100644 --- 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 b5861ea4..7d0cc593 100644 --- 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 c9e30dce..2d912018 100644 --- 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 bca21fb2..bfe2c0be 100644 --- 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 eb7f3438..da9179a0 100644 --- 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 05dc2cc1..4ce766b7 100644 --- 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 -- 2.16.2
Jon Trulson <j...@radscan.com> writes: > Nice! Applied to master. > -jon > > On 06/27/2018 08:44 PM, Ulrich Wilkens wrote: >> >> This patch allows usage of builtin X11 headers and libraries for all >> platforms. >> The directory imports/x11 can be deleted afterwards. >> >> >> >> >> ------------------------------------------------------------------------------ >> Check out the vibrant tech community on one of the world's most >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> >> >> >> _______________________________________________ >> cdesktopenv-devel mailing list >> cdesktopenv-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel >> -- -mrt
_______________________________________________ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
