aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-12-16 08:38:29 +0100
committerMihai Moldovan <ionic@ionic.de>2017-12-16 08:38:29 +0100
commit404e6634a3af5352043bcb5c2c57ec25c8728281 (patch)
treeb0a89bb0f37642910b2e3b5e277d22b6a3223ab8
parente37532ca89876b782d5034a1f0fc126327b6e470 (diff)
downloadnx-libs-404e6634a3af5352043bcb5c2c57ec25c8728281.tar.gz
nx-libs-404e6634a3af5352043bcb5c2c57ec25c8728281.tar.bz2
nx-libs-404e6634a3af5352043bcb5c2c57ec25c8728281.zip
zlib compatibility: whenever we want -I flags only, assume that the headers are directly available.
Especially don't add linking flags willy-nilly.
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Imakefile4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index a67b2accf..26374f85a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -175,7 +175,7 @@ INCLUDES = \
$(VFBINCLUDES) \
`pkg-config --cflags-only-I libxml-2.0` \
`pkg-config --cflags-only-I pixman-1` \
- $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || echo "-lz") \
+ $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --cflags-only-I 'zlib') \
`pkg-config --cflags-only-I libpng` \
$(NULL)
#else
@@ -199,7 +199,7 @@ INCLUDES = \
$(VFBINCLUDES) \
`pkg-config --cflags-only-I libxml-2.0` \
`pkg-config --cflags-only-I pixman-1` \
- $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || echo "-lz") \
+ $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --cflags-only-I 'zlib') \
`pkg-config --cflags-only-I libpng` \
$(NULL)
#endif
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile
index 06c686c0f..407baab80 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile
@@ -34,7 +34,7 @@ OBJS = \
-I$(XBUILDINCDIR) \
-I../../../../../lib/include/X11 \
`pkg-config --cflags-only-I pixman-1` \
- $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || echo "-lz") \
+ $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --cflags-only-I 'zlib') \
`pkg-config --cflags-only-I libpng` \
$(NULL)