aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-27 16:08:06 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-05-01 15:46:01 +0200
commit06aa41671963dac9fa4bf84a8fc996a5360c94b0 (patch)
tree750cf2a9f449589f4345d23e688742811a11a89d /nx-X11/config
parentdba779d9f99ab2fc6bf05c78515dbdd82840cadd (diff)
downloadnx-libs-06aa41671963dac9fa4bf84a8fc996a5360c94b0.tar.gz
nx-libs-06aa41671963dac9fa4bf84a8fc996a5360c94b0.tar.bz2
nx-libs-06aa41671963dac9fa4bf84a8fc996a5360c94b0.zip
library clean-up: Don't build libNX_Xdamage anymore. Use system's libXdamage shared library. (Fixes ArcticaProject/nx-libs#6, X2GoBTS#826).
Diffstat (limited to 'nx-X11/config')
-rw-r--r--nx-X11/config/cf/X11.tmpl40
-rw-r--r--nx-X11/config/cf/host.def2
2 files changed, 1 insertions, 41 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 74b1b5fe7..de60cecaa 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -339,16 +339,12 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildDamage
#define BuildDamage BuildXfixes
#endif
-#ifndef BuildDamageLibrary
-#define BuildDamageLibrary !BuildServersOnly
-#endif
#ifndef BuildComposite
#define BuildComposite (BuildXfixes && BuildDamage)
#endif
#ifndef BuildCompositeLibrary
-#define BuildCompositeLibrary !BuildServersOnly && (BuildXfixesLibrary && \
- BuildDamageLibrary)
+#define BuildCompositeLibrary !BuildServersOnly && BuildXfixesLibrary
#endif
#ifndef BuildXevie
@@ -1581,30 +1577,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
#define ProfileLibXfixes NO
#endif
-#if BuildDamageLibrary
-#ifndef SharedLibXdamage
-#define SharedLibXdamage HasSharedLibraries
-#endif
-#ifndef NormalLibXdamage
-#define NormalLibXdamage (!SharedLibXdamage || ForceNormalLib)
-#endif
-#ifndef DebugLibXdamage
-#define DebugLibXdamage NO
-#endif
-#ifndef ProfileLibXdamage
-#define ProfileLibXdamage NO
-#endif
-#else
-#undef SharedLibXdamage
-#define SharedLibXdamage NO
-#undef NormalLibXdamage
-#define NormalLibXdamage NO
-#undef DebugLibXdamage
-#define DebugLibXdamage NO
-#undef ProfileLibXdamage
-#define ProfileLibXdamage NO
-#endif
-
#if BuildCompositeLibrary
#ifndef SharedLibXcomposite
#define SharedLibXcomposite HasSharedLibraries
@@ -1801,16 +1773,6 @@ SharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev
ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir)
#endif
- XDAMAGELIBSRC = $(LIBSRC)/Xdamage
-#if SharedLibXdamage
-#ifndef SharedXdamageRev
-#define SharedXdamageRev 1.0
-#endif
-SharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),SOXDAMAGEREV,SharedXdamageRev)
-#else
-ProjectUnsharedLibReferences(XDAMAGE,NX_Xdamage,$(XDAMAGELIBSRC),XBuildLibDir)
-#endif
-
XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite
#if SharedLibXcomposite
#ifndef SharedXcompositeRev
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index 28e36da82..0566befdd 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -123,8 +123,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define BuildLibraries YES
#endif
-#define BuildDamageLibrary YES
-
#define BuildXfixesLibrary YES
#define BuildCompositeLibrary YES