Commit f7e6c45a authored by Mike Gabriel's avatar Mike Gabriel

Add patch: 002_nxcompshad-build-against-nx-x11-only.patch

parent 954557e9
......@@ -4,5 +4,6 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low
* Use NX adapted LD_LIBRARY_PATH in debian/rules.
* Add quilt as build dependency.
* Add main Makefile via patch: 001_add-main-makefile.patch.
* Add patch: 002_nxcompshad-build-against-nx-x11-only.patch
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 14 Oct 2011 03:01:39 +0200
Build nxcompshad against own nx-X11 sources instead of the system's X11.
--- 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.
001_add-main-makefile.patch
002_nxcompshad-build-against-nx-x11-only.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment