diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-09 11:46:07 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-09 11:52:08 +0100 |
| commit | 3b4a915984b3136f6fddb0cdfdec01cf64715c46 (patch) | |
| tree | dc1cef58075aa0f8c393dc3a7cb4b8bdaad06fcd /nxcompshad | |
| parent | 7a1bd6b29b1b780569a09b0c534000a9841a70b6 (diff) | |
| download | nx-libs-3b4a915984b3136f6fddb0cdfdec01cf64715c46.tar.gz nx-libs-3b4a915984b3136f6fddb0cdfdec01cf64715c46.tar.bz2 nx-libs-3b4a915984b3136f6fddb0cdfdec01cf64715c46.zip | |
Build nxcompshad against nx-X11 (002_nxcompshad_build-against-nx-x11-only.full.patch).
Make sure nxcompshad get built against nx-X11.
.
Furthermore /usr/X11R6/lib is an outdated path on
current Debian systems.
Diffstat (limited to 'nxcompshad')
| -rw-r--r-- | nxcompshad/Makefile.in | 4 | ||||
| -rw-r--r-- | nxcompshad/configure.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 1580a3594..c6aeaf0cb 100644 --- a/nxcompshad/Makefile.in +++ b/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) diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in index 3f16ee97f..f0bdecd12 100644 --- a/nxcompshad/configure.in +++ b/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. |