summaryrefslogtreecommitdiff
path: root/libmysql_r
diff options
context:
space:
mode:
authorjoreland@mysql.com <>2005-01-12 11:24:46 +0100
committerjoreland@mysql.com <>2005-01-12 11:24:46 +0100
commit953df8f48d960829004c55d21c21e4bfcfc1d1ff (patch)
tree1f0b9b0d34e656749bbdb72b8f4306485974c23d /libmysql_r
parent4860bf9a06f597c420c4b285a178775ea7deefd4 (diff)
parenteeabd0bb67142c679de376bff13b7fce09960977 (diff)
downloadmariadb-git-953df8f48d960829004c55d21c21e4bfcfc1d1ff.tar.gz
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
Diffstat (limited to 'libmysql_r')
-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 82253154771..e8c576ca2b1 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@ \