aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf/X11.tmpl
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-05-05 10:24:24 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-30 00:05:53 +0100
commit2d776b14fddc5ec70c97aa82672f3a7c9caef6a3 (patch)
treebce0e94255ec55f75f79a8b11e851494d6e363f6 /nx-X11/config/cf/X11.tmpl
parente4763fb4879ce8782e50c784ed9e7d8c5a1b7322 (diff)
downloadnx-libs-2d776b14fddc5ec70c97aa82672f3a7c9caef6a3.tar.gz
nx-libs-2d776b14fddc5ec70c97aa82672f3a7c9caef6a3.tar.bz2
nx-libs-2d776b14fddc5ec70c97aa82672f3a7c9caef6a3.zip
library clean-up: Don't build libNX_Xinerama anymore. Use system's libXinerama shared library. (Fixes ArcticaProject/nx-libs#49).
This commit goes along with a patch from Ulrich Sibiller who managed to move the Xinerama awareness for NX sessions into the Xserver code. This makes Xinerama support for NX in libNX_Xinerama.so obsolete. Fixes ArcticaProject/nx-libs#49
Diffstat (limited to 'nx-X11/config/cf/X11.tmpl')
-rw-r--r--nx-X11/config/cf/X11.tmpl37
1 files changed, 0 insertions, 37 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index af466b47f..3e7423040 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -226,9 +226,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXinerama
#define BuildXinerama NO
#endif
-#ifndef BuildXineramaLibrary
-#define BuildXineramaLibrary (BuildXinerama)
-#endif
#ifndef BuildXCSecurity
#define BuildXCSecurity YES
#endif
@@ -1321,30 +1318,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
XLIBONLY = $(XONLYLIB)
LINTXONLYLIB = $(LINTXONLY)
-#if BuildXineramaLibrary
-#ifndef SharedLibXinerama
-#define SharedLibXinerama HasSharedLibraries
-#endif
-#ifndef NormalLibXinerama
-#define NormalLibXinerama (!SharedLibXinerama || ForceNormalLib)
-#endif
-#ifndef DebugLibXinerama
-#define DebugLibXinerama NO
-#endif
-#ifndef ProfileLibXinerama
-#define ProfileLibXinerama NO
-#endif
-#else
-#undef SharedLibXinerama
-#define SharedLibXinerama NO
-#undef NormalLibXinerama
-#define NormalLibXinerama NO
-#undef DebugLibXinerama
-#define DebugLibXinerama NO
-#undef ProfileLibXinerama
-#define ProfileLibXinerama NO
-#endif
-
#if BuildRenderLibrary
#ifndef SharedLibXrender
#define SharedLibXrender HasSharedLibraries
@@ -1395,16 +1368,6 @@ LINTEXTENSIONLIB = $(LINTEXTENSION)
XLIB = $(EXTENSIONLIB) $(XONLYLIB)
LINTXLIB = $(LINTXONLYLIB)
- XINERAMALIBSRC = $(LIBSRC)/Xinerama
-#if SharedLibXinerama
-#ifndef SharedXineramaRev
-#define SharedXineramaRev 1.0
-#endif
-SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev)
-#else
-ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir)
-#endif
-
XRENDERLIBSRC = $(LIBSRC)/Xrender
#if SharedLibXrender
#ifndef SharedXrenderRev