From de4eca1719d3d3e3d3c1767f2d33c30f87fa751c Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Fri, 4 Nov 2016 00:25:25 +0100
Subject: LibX11: drop unused xlibi18n

---
 nx-X11/config/cf/X11.tmpl    | 10 ++--------
 nx-X11/config/cf/host.def    |  1 -
 nx-X11/config/cf/lnxLib.tmpl |  1 -
 3 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'nx-X11/config')

diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 1942ca805..b2f3c001e 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -126,20 +126,14 @@ XORGRELSTRING = XorgManVersionString
 #define BuildX11Lib		BuildLibraries
 #endif
 
-#ifndef BuildLoadableXlibI18n
-#define BuildLoadableXlibI18n	(HasDlopen && SharedLibX11)
-#endif
 #ifndef InstallXcmsTxt
 #define InstallXcmsTxt		YES
 #endif
 /*
- * This disables XLOCALEDIR.  Set it if you're using BuildLoadableXlibI18n,
- * don't have either issetugid() or getresuid(), and you need to protect
- * clients that are setgid or setuid to an id other than 0.
+ * This disables XLOCALEDIR. 
  */
 #ifndef DisableXLocaleDirEnv
-#define DisableXLocaleDirEnv	BuildLoadableXlibI18n && \
-					!(HasIssetugid || HasGetresuid)
+#define DisableXLocaleDirEnv	NO
 #endif
 #ifndef BuildLoadableXlibXcursor
 #define BuildLoadableXlibXcursor (HasDlopen && SharedLibX11)
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index efd1aad7c..e9dba5958 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -534,4 +534,3 @@
  */ 
 
 #define BuildRman NO
-#define BuildLoadableXlibI18n NO
diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl
index 6748579cf..5f9d4bd7c 100644
--- a/nx-X11/config/cf/lnxLib.tmpl
+++ b/nx-X11/config/cf/lnxLib.tmpl
@@ -3,7 +3,6 @@
  */
 
 #define SharedX11Reqs     $(LDPRELIB) -ldl -lXdmcp
-#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
 #define SharedXextReqs	  $(LDPRELIB) $(XONLYLIB)
 
 #define NoMessageCatalog
-- 
cgit v1.2.3