Just doing a simple check for zlib now (in both kat and kat_jellyfish…

…) rather than relying on ax_check_zlib.m4
TGAC · Apr 29, 2018 · 368c482 · 368c482
1 parent 12c7603
commit 368c482
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 154 deletions.
diff --git a/configure.ac b/configure.ac
@@ -72,7 +72,11 @@ AC_CHECK_HEADERS([glob.h])
 # Check pthreads exists
 AX_PTHREAD(, [AC_MSG_ERROR([pthreads lib not found.  Please ensure that pthreads is properly built and configured.])])
 #Check for zlib
-AX_CHECK_ZLIB(, [AC_MSG_ERROR([zlib not found.  Please ensure that zlib is properly built and configured.])])
+AC_CHECK_LIB([z], [inflateEnd], , [AC_MSG_ERROR([libz.so not found.  Please make sure you have the zlib development pack, with header files, installed.])])
+AC_CHECK_HEADER([zlib.h], , [AC_MSG_ERROR([zlib.h not found.  Please ensure you have the zlib development pack, with header files, installed.])])
+
+
+
 
 # Required for Boost chrono on linux (clock_gettime).  Doesn't exist on Mac
 if test x"${UNAME_S}" != x"Darwin"; then

diff --git a/deps/jellyfish-2.2.0/configure.ac b/deps/jellyfish-2.2.0/configure.ac
@@ -28,7 +28,9 @@ AC_ARG_VAR([YAGGO], [Yaggo switch parser generator])
 AS_IF([test "x$YAGGO" = "x"], [AC_PATH_PROG([YAGGO], [yaggo], [false])])
 
 #Check for zlib
-AX_CHECK_ZLIB(, [AC_MSG_ERROR([zlib not found.  Please ensure that zlib is properly built and configured.])])
+AC_CHECK_LIB([z], [inflateEnd], , [AC_MSG_ERROR([libz.so not found.  Please make sure you have the zlib development pack, with header files, installed.])])
+AC_CHECK_HEADER([zlib.h], , [AC_MSG_ERROR([zlib.h not found.  Please ensure you have the zlib development pack, with header files, installed.])])
+
 
 dnl define([concat], $1$2$3)dnl
 define([PC_FILE], kat_jellyfish.pc)

diff --git a/deps/jellyfish-2.2.0/configure.ac.in b/deps/jellyfish-2.2.0/configure.ac.in
@@ -28,7 +28,9 @@ AC_ARG_VAR([YAGGO], [Yaggo switch parser generator])
 AS_IF([test "x$YAGGO" = "x"], [AC_PATH_PROG([YAGGO], [yaggo], [false])])
 
 #Check for zlib
-AX_CHECK_ZLIB(, [AC_MSG_ERROR([zlib not found.  Please ensure that zlib is properly built and configured.])])
+AC_CHECK_LIB([z], [inflateEnd], , [AC_MSG_ERROR([libz.so not found.  Please make sure you have the zlib development pack, with header files, installed.])])
+AC_CHECK_HEADER([zlib.h], , [AC_MSG_ERROR([zlib.h not found.  Please ensure you have the zlib development pack, with header files, installed.])])
+
 
 dnl define([concat], $1$2$3)dnl
 define([PC_FILE], kat_jellyfish.pc)

diff --git a/m4/ax_check_zlib.m4 b/m4/ax_check_zlib.m4