aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-23 10:31:42 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-01 15:17:42 +0200
commit26bf48bab8f6ca72d20f5375a4cbc02dbefcb359 (patch)
tree841d688fd3effd4b56a1e6585a8099ba77b29636 /nx-X11/config/cf
parentb214c73b5a0c6b9d94671bc08e08049441bf9bc6 (diff)
downloadnx-libs-26bf48bab8f6ca72d20f5375a4cbc02dbefcb359.tar.gz
nx-libs-26bf48bab8f6ca72d20f5375a4cbc02dbefcb359.tar.bz2
nx-libs-26bf48bab8f6ca72d20f5375a4cbc02dbefcb359.zip
library-cleanup: Don't build libNX_Xau anymore. Use system's libXau shared library.
Diffstat (limited to 'nx-X11/config/cf')
-rw-r--r--nx-X11/config/cf/README6
-rw-r--r--nx-X11/config/cf/X11.tmpl29
-rw-r--r--nx-X11/config/cf/host.def4
-rw-r--r--nx-X11/config/cf/linux.cf1
4 files changed, 0 insertions, 40 deletions
diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index 826682314..41ff36a01 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -189,7 +189,6 @@ X11.tmpl provides defaults for the following variables:
ConnectionFlags -D's for supported transports
ContribDir location of user-contributed sources
DebugLibX11 build libX11_d.a
- DebugLibXau build libXau_d.a
DebugLibXext build libXext_d.a
DefaultCursorTheme name of default cursor theme
DefaultFontPath default server font path
@@ -223,12 +222,10 @@ X11.tmpl provides defaults for the following variables:
NeedDefaultDepLibs boolean for enabling default DEPLIBS
NlsDir directory in which to install nls files
NormalLibX11 build libX11.a
- NormalLibXau build libXau.a
NormalLibXext build libXext.a
OsNameDefines If uname(2) unavailable, set to -DOS_NAME=OSName
PrimaryScreenResolution resolution of default server screen
ProfileLibX11 build libX11_p.a
- ProfileLibXau build libXau_p.a
ProfileLibXext build libXext_p.a
ProjectX version indicating this is the X Window System
RemoveTargetProgramByMoving boolean for rm -f that doesn't
@@ -239,7 +236,6 @@ X11.tmpl provides defaults for the following variables:
ServerOSDefines OS -D's for server
ServerAssertDefines -DNDEBUG for no assertions, /**/ for assertions
SharedLibX11 boolean for making sharable libX11.so
- SharedLibXau boolean for making sharable libXau.so
SharedLibXext boolean for making sharable libXext.so
ShmDefines MIT-SHM define
TwmDir directory in which to install twm config files
@@ -311,8 +307,6 @@ An <os>Lib.tmpl file provides defaults for the following variables:
SharedX11Reqs required libs for libX11.so
SharedX11Rev version number for libX11.so
- SharedXauReqs required libs for libXau.so
- SharedXauRev version number for libXau.so
SharedXextReqs required libs for libXext.so
SharedXextRev version number for libXext.so
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 60693afd5..a40df9fa2 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -153,10 +153,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXextLib
#define BuildXextLib BuildLibraries
#endif
-#ifndef BuildXauLib
-#define BuildXauLib (BuildLibraries || BuildLibrariesForXServers)
-#endif
-#define UseInstalledXauLib (defined(UseInstalled) || !BuildXauLib)
#ifndef BuildTestExt
#define BuildTestExt YES
#endif
@@ -1237,31 +1233,6 @@ LINTEXTENSIONLIB = $(LINTEXTENSION)
DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
XLIB = $(EXTENSIONLIB) $(XONLYLIB)
LINTXLIB = $(LINTXONLYLIB)
-#ifndef SharedLibXau
-#define SharedLibXau YES
-#endif
-#ifndef NormalLibXau
-#define NormalLibXau (!SharedLibXau | ForceNormalLib)
-#endif
-#ifndef DebugLibXau
-#define DebugLibXau NO /* debugged auth library */
-#endif
-#ifndef ProfileLibXau
-#define ProfileLibXau NO /* profiled auth library */
-#endif
- XAUTHSRC = $(LIBSRC)/Xau
-#if SharedLibXau
-#ifndef SharedXauRev
-#define SharedXauRev 6.0
-#endif
-SharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev)
-#else
-#if !UseInstalledXauLib
-ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),XBuildLibDir)
-#else
-ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR))
-#endif
-#endif
#if HasMotif
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index f1737a998..76f2f6e8b 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -411,8 +411,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define BuildXKB YES
#define BuildXKBlib YES
-#define SharedLibXau YES
-
/*
* If you are running NetBSD 0.9C or later, and have the aperture driver
* installed, uncomment this.
@@ -563,7 +561,5 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define X86EMU_LIBPATH /usr/local/lib
*/
-#define SharedLibXau YES
-
#define BuildRman NO
#define BuildLoadableXlibI18n NO
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index 1caffce8a..37be61534 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -609,7 +609,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define AsCmd CcCmd -c -x assembler
# define LdCmd CcCmd -nostdlib
# define AsmDefines -D__ELF__
-# define SharedLibXau YES
# endif /* HPArchitecture */
# ifdef i386Architecture
# define CcCmd gcc -b i486-linux