summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-01-11 21:53:39 +0100
committerjimw@mysql.com <>2005-01-11 21:53:39 +0100
commit6dbea8fc558c0cb5db1284de40acec5a44d2fb47 (patch)
treeb4f88eafdb68f8bc6886e83a21a7a0fddefa1977
parent39d90b710f787d33d044072bdd92b7b8f49c1813 (diff)
parent4e284cabae79d5fb8c05c03f1aba527db6be978f (diff)
downloadmariadb-git-6dbea8fc558c0cb5db1284de40acec5a44d2fb47.tar.gz
Merge mysql.com:/home/jwinstead2/mysql-4.1-6418
into mysql.com:/home/jwinstead2/mysql-4.1-clean
-rw-r--r--libmysql_r/Makefile.am2
1 files changed, 1 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@