diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-04-11 01:47:42 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-04-11 01:47:42 +0200 |
| commit | bb4987f164e4b7ef2b0f0342e202eea10e6abff0 (patch) | |
| tree | f717f9e181f6d688ad8b3ba340b07dda84b40556 /config | |
| parent | 38a12cc872540c4383c123b57e1cce39ce4a97be (diff) | |
| download | mariadb-git-bb4987f164e4b7ef2b0f0342e202eea10e6abff0.tar.gz | |
my_memmem.c:
Back port of include change and copyright from 5.1
Makefile.am, zlib.m4:
Use separate libtool convenience library for the bundled
zlib to embed into executables and shared libraries created,
and one to install into the pkglib directory
zlib/Makefile.am:
Use separate libtool convenience library for the bundled
zlib to embed into executables and shared libraries created,
and one to install into the pkglib directory
config/ac-macros/zlib.m4:
Use separate libtool convenience library for the bundled
zlib to embed into executables and shared libraries created,
and one to install into the pkglib directory
mysys/my_memmem.c:
Back port of include change and copyright from 5.1
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 74de715e424..5defdfd6749 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" |