summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorunknown <pem@mysql.com>2005-11-21 16:05:40 +0100
committerunknown <pem@mysql.com>2005-11-21 16:05:40 +0100
commit6eacc236da6d134a33fbfa1ee1555cf2d3177f9e (patch)
tree08ce7b6cf919fc6a59ddebd8fcc668f27704634a /config
parente8b14c4dbbe9be8a80e3a8eb68a36f441b1dde6d (diff)
downloadmariadb-git-6eacc236da6d134a33fbfa1ee1555cf2d3177f9e.tar.gz
Check for zlib with a zzlibCompileFlags() function in config/ac-macros/zlib.m4.
(Patch provided by serg) config/ac-macros/zlib.m4: Check for zlib with a zzlibCompileFlags() function. This makes it pick the bundled zlib if there's an old installed version (which wouldn't work).
Diffstat (limited to 'config')
-rw-r--r--config/ac-macros/zlib.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4
index 22cf9542cf0..ec55f19b98f 100644
--- a/config/ac-macros/zlib.m4
+++ b/config/ac-macros/zlib.m4
@@ -19,7 +19,7 @@ INCLUDES="$INCLUDES $ZLIB_INCLUDES"
LIBS="$LIBS $ZLIB_LIBS"
AC_CACHE_VAL([mysql_cv_compress],
[AC_TRY_LINK([#include <zlib.h>],
- [return compress(0, (unsigned long*) 0, "", 0);],
+ [return zlibCompileFlags();],
[mysql_cv_compress="yes"
AC_MSG_RESULT([ok])],
[mysql_cv_compress="no"])