From 779a116ff3a4de2333ce647b32a253a80cbfc2a5 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Sat, 16 Dec 2017 07:47:17 +0100
Subject: Support building with legacy zlib versions that do not ship a
 pkg-config file.

---
 m4/nx-macros.m4                                      | 18 ++++++++++++++++++
 nx-X11/programs/Xserver/Imakefile                    |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/Imakefile         |  4 ++--
 nx-X11/programs/Xserver/hw/nxagent/compext/Imakefile |  2 +-
 nxcomp/configure.ac                                  |  2 +-
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/m4/nx-macros.m4 b/m4/nx-macros.m4
index b40f628b0..1c0e1ea7a 100644
--- a/m4/nx-macros.m4
+++ b/m4/nx-macros.m4
@@ -424,3 +424,21 @@ else
 the JPEG shared library and header files are installed.])
 fi
 ]) # LIBJPEG_FALLBACK_CHECK
+
+AC_DEFUN([ZLIB_FALLBACK_CHECK],[
+AC_MSG_CHECKING([for zlib shared libary file and headers])
+AC_CHECK_LIB([z], [inflateEnd],
+    [have_zlib_lib=yes], [have_zlib_lib=no])
+AC_CHECK_HEADERS([zlib.h],
+    [have_zlib_headers=yes], [have_zlib_headers=no])
+
+if test x"$have_zlib_lib" = "xyes" && test x"$have_zlib_headers" = "xyes"; then
+    AC_MSG_RESULT([yes])
+    Z_CFLAGS=""
+    Z_LIBS="-lz"
+else
+    AC_MSG_RESULT([no])
+    AC_MSG_FAILURE([Could not find zlib on your system, make sure
+the zlib shared library and header files are installed.])
+fi
+]) # ZLIB_FALLBACK_CHECK
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)
 
diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index 8d6a078c2..12c3b5004 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -40,7 +40,7 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
 
 PKG_CHECK_MODULES([JPEG], [libjpeg], [], [LIBJPEG_FALLBACK_CHECK])
 PKG_CHECK_MODULES([PNG], [libpng])
-PKG_CHECK_MODULES([Z], [zlib])
+PKG_CHECK_MODULES([Z], [zlib], [], [ZLIB_FALLBACK_CHECK])
 
 AC_LANG([C++])
 NX_COMPILER_BRAND
-- 
cgit v1.2.3