[X2Go-Commits] [nx-libs] 01/01: zlib compatibility: whenever we want -I flags only, assume that the headers are directly available.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 404e6634a3af5352043bcb5c2c57ec25c8728281
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Dec 16 08:38:29 2017 +0100

    zlib compatibility: whenever we want -I flags only, assume that the headers are directly available.
    
    Especially don't add linking flags willy-nilly.
---
 nx-X11/programs/Xserver/hw/nxagent/Imakefile         | 4 ++--
 nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile | 2 +-
 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 a67b2ac..26374f8 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 06c686c..407baab 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)
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git