summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorkonstantin@mysql.com <>2004-07-28 09:34:06 -0700
committerkonstantin@mysql.com <>2004-07-28 09:34:06 -0700
commit22b3e25a91bffa3e89687ec57dca27c4a9540625 (patch)
treecb58e1d3ab4faf14a557960ab77131e873ee298e /acinclude.m4
parent674bbf0825b4cc9262defd8007df1d0c30740477 (diff)
downloadmariadb-git-22b3e25a91bffa3e89687ec57dca27c4a9540625.tar.gz
Fixing MYSQL_CHEKC_ZLIB_DIR to take into account user settings (in case there
are such)
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 4109ff39fdc..d2bbec82b75 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -183,8 +183,8 @@ dnl Auxiliary macro to check for zlib at given path
AC_DEFUN([MYSQL_CHECK_ZLIB_DIR], [
save_INCLUDES="$INCLUDES"
save_LIBS="$LIBS"
-INCLUDES="$ZLIB_INCLUDES"
-LIBS="$ZLIB_LIBS"
+INCLUDES="$INCLUDES $ZLIB_INCLUDES"
+LIBS="$LIBS $ZLIB_LIBS"
AC_CACHE_VAL([mysql_cv_compress],
[AC_TRY_LINK([#include <zlib.h>],
[int link_test() { return compress(0, (unsigned long*) 0, "", 0); }],