Build nxcompshad against nx-X11 (002_nxcompshad_build-against-nx-x11-only.full.patch).

debian/patches/002_nxcompshad_build-against-nx-x11-only.full.patch

-Description: Build nxcompshad against nx-X11.
- Make sure nxcompshad get built against nx-X11.
- .
- Furthermore /usr/X11R6/lib is an outdated path on
- current Debian systems.
-Forwarded: pending...
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2011-12-31
---- a/nxcompshad/Makefile.in
-+++ b/nxcompshad/Makefile.in
-@@ -48,7 +48,7 @@
- CCDEFINES   =
- 
- LDFLAGS     = @LDFLAGS@
--LIBS        = @LIBS@ -L/usr/X11R6/lib -lX11
-+LIBS        = @LIBS@ -lX11
- 
- #
- # Only if THREADS is defined.
-@@ -162,7 +162,7 @@
- 		-Wl,--enable-auto-import \
- 		-Wl,--whole-archive ${LIBARCHIVE} \
- 		-Wl,--no-whole-archive \
--		${LIBS} -L/usr/X11R6/lib
-+		${LIBS}
- 
- $(PROGRAM):	$(MOBJ) $(COBJ) $(CXXOBJ) $(LIBDLL)
- #		$(CC) $(CCFLAGS) -o $@ $(MOBJ) $(MLIBS)
---- a/nxcompshad/configure.in
-+++ b/nxcompshad/configure.in
-@@ -19,7 +19,7 @@
- 
- if test -d "../nx-X11/exports/include" ; then
-     CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include"
--    LIBS="$LIBS -L../nx-X11/exports/lib"
-+    LIBS="-L../nx-X11/exports/lib"
- fi
- 
- dnl Check whether --with-ipaq was given.

debian/patches/series

-002_nxcompshad_build-against-nx-x11-only.full.patch
 003_nxcompshad_gcc43.full.patch
 004_nx-X11_fix-nxcompshad-build.full.patch
 005_nxcomp_gcc43.full+lite.patch

nxcompshad/Makefile.in

@@ -48,7 +48,7 @@ CCINCLUDES  =
 CCDEFINES   =
 
 LDFLAGS     = @LDFLAGS@
-LIBS        = @LIBS@ -L/usr/X11R6/lib -lX11
+LIBS        = @LIBS@ -lX11
 
 #
 # Only if THREADS is defined.
@@ -162,7 +162,7 @@ $(LIBDLL): $(LIBARCHIVE)
 		-Wl,--enable-auto-import \
 		-Wl,--whole-archive ${LIBARCHIVE} \
 		-Wl,--no-whole-archive \
-		${LIBS} -L/usr/X11R6/lib
+		${LIBS}
 
 $(PROGRAM):	$(MOBJ) $(COBJ) $(CXXOBJ) $(LIBDLL)
 #		$(CC) $(CCFLAGS) -o $@ $(MOBJ) $(MLIBS)

nxcompshad/configure.in

@@ -19,7 +19,7 @@ dnl Prefer headers and libraries from nx-X11, if present.
 
 if test -d "../nx-X11/exports/include" ; then
     CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include"
-    LIBS="$LIBS -L../nx-X11/exports/lib"
+    LIBS="-L../nx-X11/exports/lib"
 fi
 
 dnl Check whether --with-ipaq was given.