diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-22 22:48:54 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-22 22:48:54 +0200 |
| commit | 825af1835c81070931d078b153e2d49df4a6bc69 (patch) | |
| tree | 8f4d31115a2a3e6159f7fba88a84e6d0997291e6 /nx-X11/config/cf/X11.tmpl | |
| parent | a5bb888248b3887bbe306505f900368b931b7f18 (diff) | |
| parent | 49fc383a4107062a843bc0c3a8fd9cae7e20e032 (diff) | |
| download | nx-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/X11.tmpl')
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 30 |
1 files changed, 0 insertions, 30 deletions
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 |