From 6217812c8bf7a7806b776c6e2d28be082cd3e902 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 28 Dec 2015 19:09:42 +0100
Subject: library clean-up: Don't build libNX_Xfixes anymore. Use system's
 libXfixes shared library.

---
 nx-X11/config/cf/X11.tmpl | 37 -------------------------------------
 nx-X11/config/cf/host.def |  2 --
 2 files changed, 39 deletions(-)

(limited to 'nx-X11/config/cf')

diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 6f226c3fa..f32cdadbf 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -295,9 +295,6 @@ XORGRELSTRING = XorgManVersionString
 #ifndef BuildXfixes
 #define BuildXfixes		YES
 #endif
-#ifndef BuildXfixesLibrary
-#define BuildXfixesLibrary	!BuildServersOnly
-#endif
 
 #ifndef BuildDamage
 #define BuildDamage		BuildXfixes
@@ -1372,30 +1369,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
 #define ProfileLibXrender	NO
 #endif
 
-#if BuildXfixesLibrary
-#ifndef SharedLibXfixes
-#define SharedLibXfixes		HasSharedLibraries
-#endif
-#ifndef NormalLibXfixes
-#define NormalLibXfixes		(!SharedLibXfixes || ForceNormalLib)
-#endif
-#ifndef DebugLibXfixes
-#define DebugLibXfixes		NO
-#endif
-#ifndef ProfileLibXfixes
-#define ProfileLibXfixes	NO
-#endif
-#else
-#undef  SharedLibXfixes
-#define SharedLibXfixes		NO
-#undef  NormalLibXfixes
-#define NormalLibXfixes		NO
-#undef  DebugLibXfixes
-#define DebugLibXfixes		NO
-#undef  ProfileLibXfixes
-#define ProfileLibXfixes	NO
-#endif
-
 #ifndef SharedLibXext
 #define SharedLibXext HasSharedLibraries
 #endif
@@ -1440,16 +1413,6 @@ ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir
 SharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),SOXRENDERREV,SharedXrenderRev)
 #else
 ProjectUnsharedLibReferences(XRENDER,NX_Xrender,$(XRENDERLIBSRC),XBuildLibDir)
-#endif
-
-    XFIXESLIBSRC = $(LIBSRC)/Xfixes
-#if SharedLibXfixes
-#ifndef SharedXfixesRev
-#define SharedXfixesRev 3.0
-#endif
-SharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),SOXFIXESREV,SharedXfixesRev)
-#else
-ProjectUnsharedLibReferences(XFIXES,NX_Xfixes,$(XFIXESLIBSRC),XBuildLibDir)
 #endif
 
 #ifndef SharedLibXau
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index 9e017d189..f1737a998 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 BuildXfixesLibrary              YES
-
 #define BuildDocs                       NO
 
 #define BuildComposite			YES
-- 
cgit v1.2.3