mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
zlib.m4:
Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=, and search the given include directory first (bug#18369)
This commit is contained in:
parent
90b1a4c770
commit
f98de2cc35
1 changed files with 3 additions and 3 deletions
|
@ -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"
|
||||
])
|
||||
|
||||
|
|
Loading…
Reference in a new issue