summaryrefslogtreecommitdiff
path: root/fastjar/configure.in
diff options
context:
space:
mode:
Diffstat (limited to 'fastjar/configure.in')
-rw-r--r--fastjar/configure.in23
1 files changed, 19 insertions, 4 deletions
diff --git a/fastjar/configure.in b/fastjar/configure.in
index 73eff881381..c240be82cb9 100644
--- a/fastjar/configure.in
+++ b/fastjar/configure.in
@@ -37,10 +37,25 @@ AC_CHECK_SIZEOF(long long)
dnl Check byte order
AC_C_BIGENDIAN
-dnl Brain dead check for tree's zlib
-ZDEPS='$(top_builddir)/../zlib/libz.a'
-ZLIBS="$ZDEPS -L\$(here)/../zlib/$libsubdir"
-ZINCS='-I$(top_srcdir)/../zlib'
+AC_ARG_WITH(system-zlib,
+[ --with-system-zlib use installed libz])
+
+ZLIBS=
+ZDEPS=
+ZINCS=
+use_zlib=maybe
+if test "$with_system_zlib" = yes; then
+ AC_CHECK_LIB(z, deflate, ZLIBS=-lz, use_zlib=no)
+else
+ use_zlib=no
+fi
+
+if test "$use_zlib" = no; then
+ # Brain dead way to find tree's zlib.
+ ZDEPS='$(top_builddir)/../zlib/libz.a'
+ ZLIBS="$ZDEPS -L\$(here)/../zlib/$libsubdir"
+ ZINCS='-I$(top_srcdir)/../zlib'
+fi
AC_SUBST(ZLIBS)
AC_SUBST(ZDEPS)
AC_SUBST(ZINCS)