diff options
| author | unknown <kent@mysql.com> | 2006-04-01 03:49:14 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-04-01 03:49:14 +0200 |
| commit | 3ff1ec0f89f6f829f711118d017a9d0a6dfbaa37 (patch) | |
| tree | f92f2e1caf2c1a6be5b28f494c89d2495d9cc247 /config | |
| parent | 381e1fced672681fb2a7f64916a85f669a676352 (diff) | |
| download | mariadb-git-3ff1ec0f89f6f829f711118d017a9d0a6dfbaa37.tar.gz | |
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)
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/zlib.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
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 <zlib.h>], @@ -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" ]) |