diff options
| author | kent@mysql.com/kent-amd64.(none) <> | 2007-04-05 08:36:56 +0200 |
|---|---|---|
| committer | kent@mysql.com/kent-amd64.(none) <> | 2007-04-05 08:36:56 +0200 |
| commit | 463b34e77b187a4d6f725076de6713b7d49a9e5e (patch) | |
| tree | 5b98b7f8f3662385f01aa7a655d3a8416058cc74 /zlib | |
| parent | 6249bb34a4c55bc485118569a09c106e16373d52 (diff) | |
| download | mariadb-git-463b34e77b187a4d6f725076de6713b7d49a9e5e.tar.gz | |
zlib.m4:
Only require the more recent zlibCompileFlags() when
building the server, client zlib don't need it.
Makefile.am:
Always build the bundled zlib static only
configure.in:
Look for dlopen() even if --with-mysqld-ldflags constains "-static",
as this is not the same as the flag to "ld", it just informs
"libtool" to link static with libraries created part of the build,
even if there exists shared versions.
make_binary_distribution.sh:
Real "mysqlmanager" executable might be in ".libs"
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 |