blob: 4e92c3b0402037c11322daa68b9867bc06e15e76 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
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.
|