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 | |
| 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
| -rw-r--r-- | config/ac-macros/zlib.m4 | 2 | ||||
| -rw-r--r-- | zlib/Makefile.am | 17 |
2 files changed, 10 insertions, 9 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" diff --git a/zlib/Makefile.am b/zlib/Makefile.am index f5741a782fb..edcbd5f4a75 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -19,17 +19,18 @@ INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include LIBS= $(NON_THREADED_LIBS) -pkglib_LTLIBRARIES=libz.la +pkglib_LTLIBRARIES = libz.la +noinst_LTLIBRARIES = libzlt.la -# We are never interested in a shared version -libz_la_LDFLAGS= -static +libz_la_LDFLAGS = -static -noinst_HEADERS= crc32.h deflate.h inffast.h inffixed.h inflate.h \ - inftrees.h trees.h zconf.h zlib.h zutil.h +noinst_HEADERS = crc32.h deflate.h inffast.h inffixed.h inflate.h \ + inftrees.h trees.h zconf.h zlib.h zutil.h -libz_la_SOURCES= adler32.c compress.c crc32.c deflate.c gzio.c \ - infback.c inffast.c inflate.c inftrees.c trees.c \ - uncompr.c zutil.c +libz_la_SOURCES = adler32.c compress.c crc32.c deflate.c gzio.c \ + infback.c inffast.c inflate.c inftrees.c trees.c \ + uncompr.c zutil.c +libzlt_la_SOURCES = $(libz_la_SOURCES) EXTRA_DIST= README FAQ INDEX ChangeLog algorithm.txt zlib.3 CMakeLists.txt |