aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-04-22 22:48:54 +0200
committerMihai Moldovan <ionic@ionic.de>2015-04-22 22:48:54 +0200
commit825af1835c81070931d078b153e2d49df4a6bc69 (patch)
tree8f4d31115a2a3e6159f7fba88a84e6d0997291e6 /nx-X11/config/cf
parenta5bb888248b3887bbe306505f900368b931b7f18 (diff)
parent49fc383a4107062a843bc0c3a8fd9cae7e20e032 (diff)
downloadnx-libs-825af1835c81070931d078b153e2d49df4a6bc69.tar.gz
nx-libs-825af1835c81070931d078b153e2d49df4a6bc69.tar.bz2
nx-libs-825af1835c81070931d078b153e2d49df4a6bc69.zip
Merge branch 'sunweaver-pr/libxdmcp-cleanup' into arctica-3.6.x
Attributes GH PR #15: https://github.com/ArcticaProject/nx-libs/pull/15
Diffstat (limited to 'nx-X11/config/cf')
-rw-r--r--nx-X11/config/cf/README6
-rw-r--r--nx-X11/config/cf/X11.tmpl30
2 files changed, 0 insertions, 36 deletions
diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index 80113a9e3..323b6bc5e 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -204,7 +204,6 @@ X11.tmpl provides defaults for the following variables:
DebugLibX11 build libX11_d.a
DebugLibXau build libXau_d.a
DebugLibXaw build libXaw_d.a
- DebugLibXdmcp build libXdmcp_d.a
DebugLibXext build libXext_d.a
DebugLibXi build libXi_d.a
DebugLibXmu build libXmu_d.a
@@ -253,7 +252,6 @@ X11.tmpl provides defaults for the following variables:
NormalLibX11 build libX11.a
NormalLibXau build libXau.a
NormalLibXaw build libXaw.a
- NormalLibXdmcp build libXdmcp.a
NormalLibXext build libXext.a
NormalLibXi build libXi.a
NormalLibXmu build libXmu.a
@@ -269,7 +267,6 @@ X11.tmpl provides defaults for the following variables:
ProfileLibX11 build libX11_p.a
ProfileLibXau build libXau_p.a
ProfileLibXaw build libXaw_p.a
- ProfileLibXdmcp build libXdmcp_p.a
ProfileLibXext build libXext_p.a
ProfileLibXi build libXi_p.a
ProfileLibXmu build libXmu_p.a
@@ -291,7 +288,6 @@ X11.tmpl provides defaults for the following variables:
SharedLibX11 boolean for making sharable libX11.so
SharedLibXau boolean for making sharable libXau.so
SharedLibXaw boolean for making sharable libXaw.so
- SharedLibXdmcp boolean for making sharable libXdmcp.so
SharedLibXext boolean for making sharable libXext.so
SharedLibXi boolean for making sharable libXi.so
SharedLibXmu boolean for making sharable libXmu.so
@@ -384,8 +380,6 @@ An <os>Lib.tmpl file provides defaults for the following variables:
SharedXauRev version number for libXau.so
SharedXawReqs required libs for libXaw.so
SharedXawRev version number for libXaw.so
- SharedXdmcpReqs required libs for libXdmcp.so
- SharedXdmcpRev version number for libXdmcp.so
SharedXextReqs required libs for libXext.so
SharedXextRev version number for libXext.so
SharedXiReqs required libs for libXi.so
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 30b04510b..f89873d01 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -171,10 +171,6 @@ XORGRELSTRING = XorgManVersionString
#define BuildXauLib (BuildLibraries || BuildLibrariesForXServers)
#endif
#define UseInstalledXauLib (defined(UseInstalled) || !BuildXauLib)
-#ifndef BuildXdmcpLib
-#define BuildXdmcpLib (BuildLibraries || BuildLibrariesForXServers)
-#endif
-#define UseInstalledXdmcpLib (defined(UseInstalled) || !BuildXdmcpLib)
#ifndef BuildMITMiscExt
#define BuildMITMiscExt YES
#endif
@@ -2442,32 +2438,6 @@ ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR))
#endif
#endif
-#ifndef SharedLibXdmcp
-#define SharedLibXdmcp YES
-#endif
-#ifndef NormalLibXdmcp
-#define NormalLibXdmcp (!SharedLibXdmcp | ForceNormalLib)
-#endif
-#ifndef DebugLibXdmcp
-#define DebugLibXdmcp NO /* debugged XDMCP library */
-#endif
-#ifndef ProfileLibXdmcp
-#define ProfileLibXdmcp NO /* profiled XDMCP library */
-#endif
- XDMCPLIBSRC = $(LIBSRC)/Xdmcp
-#if SharedLibXdmcp
-#ifndef SharedXdmcpRev
-#define SharedXdmcpRev 6.0
-#endif
-SharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev)
-#else
-#if !UseInstalledXdmcpLib
-ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),XBuildLibDir)
-#else
-ProjectUnsharedLibReferences(XDMCP,NX_Xdmcp,$(XDMCPLIBSRC),$(USRLIBDIR))
-#endif
-#endif
-
#ifndef SharedLibXmu
#define SharedLibXmu HasSharedLibraries
#endif