From 4e284cabae79d5fb8c05c03f1aba527db6be978f Mon Sep 17 00:00:00 2001
From: "jimw@mysql.com" <>
Date: Wed, 5 Jan 2005 03:05:19 +0100
Subject: [PATCH 1/2] Use ZLIB_LIBS when linking libmysqlclient_r (Bug #6418)

---
 libmysql_r/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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@

From 39d90b710f787d33d044072bdd92b7b8f49c1813 Mon Sep 17 00:00:00 2001
From: "jimw@mysql.com" <>
Date: Tue, 11 Jan 2005 21:50:30 +0100
Subject: [PATCH 2/2] Replace ZLIB_LIBS in mysql_config. (Bug #6418)

---
 scripts/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

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@!' \