diff options
| author | unknown <jimw@mysql.com> | 2005-01-11 21:55:39 +0100 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-11 21:55:39 +0100 |
| commit | 90d6c0629fd3a83cd223ba7e106920b2d3042dd0 (patch) | |
| tree | 74424794065a59c693ecd664681828516577f812 | |
| parent | 22de48855756432c954069d79e17940fae32b8e6 (diff) | |
| parent | 6eb792304c8d1016d8549fedb67b7139c083e594 (diff) | |
| download | mariadb-git-90d6c0629fd3a83cd223ba7e106920b2d3042dd0.tar.gz | |
Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jwinstead2/mysql-4.1-clean
| -rw-r--r-- | libmysql_r/Makefile.am | 2 | ||||
| -rw-r--r-- | scripts/Makefile.am | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index 939cb4c73dd..0a5c380ff35 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -22,7 +22,7 @@ target = libmysqlclient_r.la target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@ -LIBS = @LIBS@ @openssl_libs@ +LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@ INCLUDES = @MT_INCLUDES@ \ -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 4158b5a34dc..71b70fc0e4a 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -121,6 +121,7 @@ SUFFIXES = .sh -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\ -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\ -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \ + -e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \ -e 's!@''LIBS''@!@LIBS@!' \ -e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \ -e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \ |