diff options
| author | unknown <kent@mysql.com> | 2006-04-01 03:28:07 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-04-01 03:28:07 +0200 |
| commit | 1f762dab21742c6e2f85cca7805031e89fb86218 (patch) | |
| tree | 60612768d482e2181c2b69a01ae4742aeedefc6a /acinclude.m4 | |
| parent | 0ad405f9d4665a13e74c60520186f25d48b4c8ff (diff) | |
| download | mariadb-git-1f762dab21742c6e2f85cca7805031e89fb86218.tar.gz | |
acinclude.m4:
Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=,
and search the given include directory first (bug#18369)
acinclude.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 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d9b8030696d..9af6d2c3acd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -233,9 +233,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>], @@ -244,7 +244,7 @@ AC_CACHE_VAL([mysql_cv_compress], AC_MSG_RESULT([ok])], [mysql_cv_compress="no"]) ]) -INCLUDES="$save_INCLUDES" +CPPFLAGS="$save_CPPFLAGS" LIBS="$save_LIBS" ]) |