Browse Source

Check zlib availability usin AC_CHECK_LIB

This is workaround for zlib 1.2.3 which does not come with pkg-config
file.
Tatsuhiro Tsujikawa 12 years ago
parent
commit
774e1b8a10
1 changed files with 8 additions and 3 deletions
  1. 8 3
      configure.ac

+ 8 - 3
configure.ac

@@ -110,16 +110,21 @@ fi
 if test "x$with_libz" = "xyes"; then
   PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3], [have_zlib=yes], [have_zlib=no])
   if test "x$have_zlib" = "xyes"; then
-    AC_DEFINE([HAVE_ZLIB], [1], [Define to 1 if you have zlib.])
     LIBS="$ZLIB_LIBS $LIBS"
     CPPFLAGS="$ZLIB_CFLAGS $CPPFLAGS"
-    AC_CHECK_FUNCS([gzbuffer gzsetparams])
   else
     AC_MSG_WARN([$ZLIB_PKG_ERRORS])
-    if test "x$with_libz_requested" = "xyes"; then
+    AC_CHECK_LIB([z], [zlibVersion], [have_zlib=yes], [have_zlib=no])
+    if test "x$have_zlib" = "xyes"; then
+      LIBS="-lz $LIBS"
+    elif test "x$with_libz_requested" = "xyes"; then
       ARIA2_DEP_NOT_MET([libz])
     fi
   fi
+  if test "x$have_zlib" = "xyes"; then
+    AC_DEFINE([HAVE_ZLIB], [1], [Define to 1 if you have zlib.])
+    AC_CHECK_FUNCS([gzbuffer gzsetparams])
+  fi
 fi
 
 if test "x$with_libuv" = "xyes"; then