diff options
| author | konstantin@mysql.com <> | 2004-07-27 10:05:55 -0700 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2004-07-27 10:05:55 -0700 |
| commit | d68ed3f0f7bc0730c97f4b40fdc9d42d1b5c60ad (patch) | |
| tree | 68c9750f9fa1635feca481ec2035c897fda55320 /tools | |
| parent | 569d3c848884b09f30ec0e8ef8bafb73aa167e3e (diff) | |
| download | mariadb-git-d68ed3f0f7bc0730c97f4b40fdc9d42d1b5c60ad.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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
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) |