diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-17 20:49:53 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-17 20:49:53 +0100 |
| commit | 1f60704371940a34c51c1badad7de1a22aba5fb7 (patch) | |
| tree | 445e7075050d1f63e0110edfae979f1ccea34470 /nx-X11/config | |
| parent | cb8bcbec88d3a1f181809df3bd1df887e92055dd (diff) | |
| parent | de4eca1719d3d3e3d3c1767f2d33c30f87fa751c (diff) | |
| download | nx-libs-1f60704371940a34c51c1badad7de1a22aba5fb7.tar.gz nx-libs-1f60704371940a34c51c1badad7de1a22aba5fb7.tar.bz2 nx-libs-1f60704371940a34c51c1badad7de1a22aba5fb7.zip | |
Merge branch 'uli42-pr/remove_xlibi18n' into 3.6.x
Attributes GH PR #279: https://github.com/ArcticaProject/nx-libs/pull/279
Fixes ArcticaProject/nx-libs#264.
Diffstat (limited to 'nx-X11/config')
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 10 | ||||
| -rw-r--r-- | nx-X11/config/cf/host.def | 1 | ||||
| -rw-r--r-- | nx-X11/config/cf/lnxLib.tmpl | 1 |
3 files changed, 2 insertions, 10 deletions
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 |