From 6a371e242b7ee7549089233662d0b2c369e51d64 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 27 Jul 2004 10:05:55 -0700 Subject: 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 --- tools/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/Makefile.am b/tools/Makefile.am index 50d1c8af56a..0dc90a0d107 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -17,7 +17,7 @@ INCLUDES=@MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes) LDADD= @CLIENT_EXTRA_LDFLAGS@ @openssl_libs@ @ZLIB_LIBS@ \ - $(top_builddir)/libmysql_r/libmysqlclient_r.la \ + $(top_builddir)/libmysql_r/libmysqlclient_r.la bin_PROGRAMS= mysqlmanager mysqlmanager_SOURCES= mysqlmanager.c mysqlmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) -- cgit v1.2.1