diff options
| author | unknown <konstantin@mysql.com> | 2004-07-28 10:02:38 -0700 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-07-28 10:02:38 -0700 |
| commit | 2137dff8e72fd576e4bddfe67a717b83291fa37e (patch) | |
| tree | df7dd080d216d91d308c536f84d4a6abd478ab71 | |
| parent | b620ae298a2496246f2c3f645f691c3eb300d048 (diff) | |
| parent | 9aa6d52a9459e2fcfe2f0176717d841247425895 (diff) | |
| download | mariadb-git-2137dff8e72fd576e4bddfe67a717b83291fa37e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
| -rw-r--r-- | acinclude.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 4109ff39fdc..d2bbec82b75 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -183,8 +183,8 @@ dnl Auxiliary macro to check for zlib at given path AC_DEFUN([MYSQL_CHECK_ZLIB_DIR], [ save_INCLUDES="$INCLUDES" save_LIBS="$LIBS" -INCLUDES="$ZLIB_INCLUDES" -LIBS="$ZLIB_LIBS" +INCLUDES="$INCLUDES $ZLIB_INCLUDES" +LIBS="$LIBS $ZLIB_LIBS" AC_CACHE_VAL([mysql_cv_compress], [AC_TRY_LINK([#include <zlib.h>], [int link_test() { return compress(0, (unsigned long*) 0, "", 0); }], |