From 3ff1ec0f89f6f829f711118d017a9d0a6dfbaa37 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 1 Apr 2006 03:49:14 +0200 Subject: zlib.m4: Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=, and search the given include directory first (bug#18369) config/ac-macros/zlib.m4: Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=, and search the given include directory first (bug#18369) --- config/ac-macros/zlib.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4 index 8aafb3f4ced..a8c54c845a1 100644 --- a/config/ac-macros/zlib.m4 +++ b/config/ac-macros/zlib.m4 @@ -13,9 +13,9 @@ mysql_cv_compress="yes" dnl Auxiliary macro to check for zlib at given path AC_DEFUN([MYSQL_CHECK_ZLIB_DIR], [ -save_INCLUDES="$INCLUDES" +save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" -INCLUDES="$INCLUDES $ZLIB_INCLUDES" +CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS" LIBS="$LIBS $ZLIB_LIBS" AC_CACHE_VAL([mysql_cv_compress], [AC_TRY_LINK([#include ], @@ -24,7 +24,7 @@ AC_CACHE_VAL([mysql_cv_compress], AC_MSG_RESULT([ok])], [mysql_cv_compress="no"]) ]) -INCLUDES="$save_INCLUDES" +CPPFLAGS="$save_CPPFLAGS" LIBS="$save_LIBS" ]) -- cgit v1.2.1