Merge branch 'sunweaver-pr/hard-code-rgb-colors' into 3.6.x

Attributes GH PR #319: https://github.com/ArcticaProject/nx-libs/pull/319

5 files changed, 0 insertions, 28 deletions

diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index ba97b3b4c..879b55a3b 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -539,9 +539,6 @@ X_BYTE_ORDER = ByteOrder
 #ifndef HasMktemp
 #define HasMktemp		NO	/* if you have the mktemp command */
 #endif
-#ifndef HasNdbm
-#define HasNdbm			NO
-#endif
 #ifndef HasSecureRPC
 #define HasSecureRPC		NO	/* if you have Secure RPC */
 #endif
@@ -1286,13 +1283,6 @@ TCLIBDIR = TclLibDir
 #ifndef ToolkitStringsABIOptions
 #define ToolkitStringsABIOptions /**/
 #endif
-#ifndef NdbmDefines
-#if HasNdbm
-#define NdbmDefines -DNDBM
-#else
-#define NdbmDefines /**/
-#endif
-#endif
 #ifndef HasLdRunPath
 #define HasLdRunPath NO
 #endif
@@ -1317,9 +1307,6 @@ TCLIBDIR = TclLibDir
 #ifndef MathLibrary
 #define MathLibrary -lm
 #endif
-#ifndef DBMLibrary
-#define DBMLibrary -ldbm
-#endif
 #ifndef DlLibrary
 #define DlLibrary -ldl
 #endif
diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index 9cb2ff91e..863c66a82 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -65,7 +65,6 @@ Imake.tmpl provides defaults for the following variables:
 	HasLibCrypt		boolean for system has libcrypt
         HasMotif                boolean for system has Motif
         HasMotif2               boolean for system has Motif2 or OpenMotif
-	HasNdbm			boolean for system has ndbm routines
 	HasPoll			use poll() syscall?
 	HasPurify		boolean for system has Purify
 	HasPutenv		boolean for libc has putenv()
@@ -114,7 +113,6 @@ Imake.tmpl provides defaults for the following variables:
 	MkCookieCmd		command to generate an xauth cookie
 	MsMacros		macro flag for TroffCmd, normally "-ms"
 	MvCmd			command to rename a file
-	NdbmDefines		-D's to turn on use of ndbm routines
 	NeedConstPrototoypes	whether const is supported
 	NeedFunctionPrototypes	whether or not to force function prototypes
 	NeedNestedPrototypes	whether nested prototypes are supported
@@ -176,7 +174,6 @@ X11.tmpl provides defaults for the following variables:
 	DebugLibX11		build libX11_d.a
 	DefaultCursorTheme      name of default cursor theme
 	DefaultFontPath		default server font path
-	DefaultRGBDatabase	default server rgb color database
 	DefaultSystemPath	default system xdm PATH environment variable
 	DefaultSystemShell	default /bin/sh
 	DefaultUserPath		default user xdm PATH environment variable
@@ -220,7 +217,6 @@ X11.tmpl provides defaults for the following variables:
 	ShmDefines		MIT-SHM define
 	TwmDir			directory in which to install twm config files
 	UseCCMakeDepend		boolean for using alternate makedepend script
-	UseRgbTxt		use rgb.txt file as is instead of DBM-compiled
 	VarDirectory		directory in /var for logs, etc., and config
 	VendorHasX11R6_3libXext	don't need Security & AppGroup in xrx plug-in
 	XAppLoadDir		directory in which to install app defaults
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index fe94e1f4d..54f94355d 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -312,12 +312,6 @@ XORGRELSTRING = XorgManVersionString
 #ifndef DefaultFSFontPath
 # define DefaultFSFontPath DefaultFontPath
 #endif
-#ifndef DefaultRGBDatabase
-#define DefaultRGBDatabase $(USRDATADIR)/rgb
-#endif
-#ifndef UseRgbTxt
-#define UseRgbTxt		NO	/* default is to compile with dbm */
-#endif
 #ifndef UseMemLeak
 #define UseMemLeak		NO
 #endif
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index e9dba5958..ffcf4c0de 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -165,7 +165,6 @@
 
 #if defined(cygwinArchitecture)
 #define DefaultFontPath		/mnt/NX/fonts/base/,/mnt/NX/fonts/misc/,/mnt/NX/fonts/Speedo/,/mnt/NX/fonts/Type1/,/mnt/NX/fonts/75dpi/,/mnt/NX/fonts/100dpi/,/mnt/NX/fonts/TTF/
-#define DefaultRGBDatabase      /mnt/NX/fonts/rgb
 #endif /* #if defined(cygwinArchitecture) */
 
 /*
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 513f78a43..ddc501978 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -660,10 +660,6 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
 # define OtherIConfigFiles $(IRULESRC)/xf86.rules
 #endif
 
-#ifndef UseRgbTxt
-# define UseRgbTxt	YES
-#endif
-
 #ifndef ManSuffix
 # define ManSuffix	1
 #endif