diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-04-05 08:42:32 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-04-05 08:42:32 +0200 |
| commit | 220bbe82b56305aad44083ad11f240a6d43a0fc8 (patch) | |
| tree | c366bc5dfa72c8aad36fc5968a46858036ea66dd /zlib | |
| parent | 1acb0affa1925c01a5eae46136583fe58a6e1b26 (diff) | |
| parent | 60289fba0ba697e2bbab6136e7840216bea0633d (diff) | |
| download | mariadb-git-220bbe82b56305aad44083ad11f240a6d43a0fc8.tar.gz | |
Merge mysql.com:/home/kent/bk/sotest/mysql-5.0-build
into mysql.com:/home/kent/bk/sotest/mysql-5.1-build
BitKeeper/deleted/.del-SETUP.sh.rej:
Auto merged
BitKeeper/deleted/.del-configure.in.rej:
Auto merged
BitKeeper/deleted/.del-my_global.h.rej:
Auto merged
BitKeeper/deleted/.del-my_pthread.h.rej:
Auto merged
BitKeeper/deleted/.del-thr_alarm.c.rej:
Auto merged
config/ac-macros/zlib.m4:
Auto merged
configure.in:
Auto merged
zlib/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
SCCS merged
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/zlib/Makefile.am b/zlib/Makefile.am index c40c922851e..f5741a782fb 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -21,7 +21,8 @@ LIBS= $(NON_THREADED_LIBS) pkglib_LTLIBRARIES=libz.la -libz_la_LDFLAGS= -version-info 3:3:2 +# We are never interested in a shared version +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 |