mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

WL#1518 "make bundled zlib usable for unix builds", post review fixes:

Browse source 
- 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
This commit is contained in:
unknown 2004-07-27 10:05:55 -07:00
commit 6a371e242b
3 changed files with 78 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

10
zlib/Makefile.am
View file

@ -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