From 1371af04f4162dd25d58c4e984b0bbd1efc82917 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 6 Jun 2007 13:37:18 +0300 Subject: [PATCH] Unbreak zlib configure check. --- configure.ac | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index b6a0c6c..f1ac70b 100644 --- a/configure.ac +++ b/configure.ac @@ -276,7 +276,7 @@ addlib() { } #================= -# Check for zlib library. Prefer internal, otherwise external. +# Check for zlib library. WITH_ZLIB_SUBDIR= WITH_ZLIB_INCLUDE= @@ -285,7 +285,7 @@ WITH_ZLIB_LIB= if test -z "${WITH_ZLIB_LIB}" ; then for zlib in z gz ; do AC_CHECK_LIB(${zlib}, gzread, - [LIBS="$LIBS -l${zlib}"; break], + [WITH_ZLIB_LIB="-l${zlib}"; break], [if test ${zlib} = gz; then AC_MSG_ERROR([sorry rpm requires libz.a or libgz.a (from the zlib package)]) fi] @@ -296,6 +296,10 @@ dnl zlib-1.0.4 has not gzseek AC_CHECK_LIB(${zlib}, gzseek, [AC_DEFINE(HAVE_GZSEEK, 1, [Define as 1 if your zlib has gzseek()])]) fi +AC_SUBST(WITH_ZLIB_SUBDIR) +AC_SUBST(WITH_ZLIB_INCLUDE) +AC_SUBST(WITH_ZLIB_LIB) + #================= # Check for bzip2 library. Prefer external, otherwise none. -- 2.7.4