Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/kostja/mysql/mysql-4.1-root

Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
7eddfc8e · konstantin@mysql.com · b2b5e871 · 22b3e25a · 7eddfc8e
Commit 7eddfc8e authored Jul 28, 2004 by konstantin@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

acinclude.m4 acinclude.m4 +2 -2

No files found.
--- 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); }],