diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-04-11 01:48:43 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-04-11 01:48:43 +0200 |
| commit | 010d81afecfa6e76c57a6de5d8cffce11c3b8a8d (patch) | |
| tree | 3bea17038bb3f93d0c5c69f0d3030fbb6da61718 /config | |
| parent | b77c664ea82bbd3286a750344e2dac5772d5423b (diff) | |
| parent | bb4987f164e4b7ef2b0f0342e202eea10e6abff0 (diff) | |
| download | mariadb-git-010d81afecfa6e76c57a6de5d8cffce11c3b8a8d.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
config/ac-macros/zlib.m4:
Auto merged
mysys/my_memmem.c:
Auto merged
zlib/Makefile.am:
Auto merged
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/zlib.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4 index 75c9d3f524e..5586b1ba816 100644 --- a/config/ac-macros/zlib.m4 +++ b/config/ac-macros/zlib.m4 @@ -2,7 +2,7 @@ dnl Define zlib paths to point at bundled zlib AC_DEFUN([MYSQL_USE_BUNDLED_ZLIB], [ ZLIB_INCLUDES="-I\$(top_srcdir)/zlib" -ZLIB_LIBS="\$(top_builddir)/zlib/libz.la" +ZLIB_LIBS="\$(top_builddir)/zlib/libzlt.la" dnl Omit -L$pkglibdir as it's always in the list of mysql_config deps. ZLIB_DEPS="-lz" zlib_dir="zlib" |