3 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 86c5abf81..25ebd73b9 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -292,7 +292,7 @@ NXAGENTOBJS = hw/nxagent/miinitext.o     \
 XPMLIB    =  -lXpm
 XMLLIB    =  `pkg-config --libs libxml-2.0`
 PIXMANLIB =  `pkg-config --libs pixman-1`
-ZLIB      =  `pkg-config --libs zlib`
+ZLIB      =  $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || echo "-lz")
 PNGLIB    =  `pkg-config --libs libpng`
 JPEGLIB   =  -ljpeg
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index c5773215c..a67b2accf 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 --cflags-only-I zlib` \
+	$$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || echo "-lz") \
 	`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 --cflags-only-I zlib` \
+	$$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || echo "-lz") \
 	`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 d364370ac..06c686c0f 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 --cflags-only-I zlib` \
+              $$(pkg-config --exists 'zlib' >/dev/null 2>&1 && pkg-config --libs 'zlib' || echo "-lz") \
               `pkg-config --cflags-only-I libpng` \
               $(NULL)