diff options
| author | unknown <konstantin@mysql.com> | 2004-07-27 10:05:55 -0700 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-07-27 10:05:55 -0700 |
| commit | 6a371e242b7ee7549089233662d0b2c369e51d64 (patch) | |
| tree | 68c9750f9fa1635feca481ec2035c897fda55320 /zlib | |
| parent | 108864ed3b523fdb377ebc1ac176000652cad33f (diff) | |
| download | mariadb-git-6a371e242b7ee7549089233662d0b2c369e51d64.tar.gz | |
WL#1518 "make bundled zlib usable for unix builds", post review fixes:
- comment for AC_DEFINE(HAVE_COMPRESS) fixed
- build convenience library from zlib: we need to compile it into both
libmysqlclient.a and libmysqlclient.so
- --with-zlib-dir=bundled configure option
acinclude.m4:
- MYSQL_CHECK_ZLIB_WITH_COMPRESS: added support for
--with-zlib-dir=bundled
- AC_DEFINE comment fixed
tools/Makefile.am:
- uncomment bin_PROGRAMS (typo fixed)
zlib/Makefile.am:
- build libtool convenience library, not static one: we need libz objects
to be compiled in libmysqlclient.so shared version
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 81d0f26082d..58d3811cd7c 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -16,14 +16,14 @@ # Process this file with automake to create Makefile.in -noinst_LIBRARIES=libz.a +noinst_LTLIBRARIES=libz.la noinst_HEADERS= crc32.h deflate.h inffast.h inffixed.h inflate.h \ - inftrees.h trees.h zconf.h zlib.h zutil.h + inftrees.h trees.h zconf.h zlib.h zutil.h -libz_a_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 EXTRA_DIST= README FAQ INDEX ChangeLog algorithm.txt zlib.3 |