diff options
| author | unknown <joreland@mysql.com> | 2005-01-12 11:24:46 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-01-12 11:24:46 +0100 |
| commit | 40649e92f77b75a41fb3097bc4813c80783ba3a8 (patch) | |
| tree | 1f0b9b0d34e656749bbdb72b8f4306485974c23d /libmysql_r | |
| parent | dd3cfa8d887bab5d7555a7ca9d1b072897b79dcd (diff) | |
| parent | ed6c9afd6d81789fba09e2aa017e1c02968bdf18 (diff) | |
| download | mariadb-git-40649e92f77b75a41fb3097bc4813c80783ba3a8.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
libmysql_r/Makefile.am:
Auto merged
mysql-test/r/analyse.result:
Auto merged
sql/sql_analyse.cc:
Auto merged
Diffstat (limited to 'libmysql_r')
| -rw-r--r-- | libmysql_r/Makefile.am | 2 |
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@ \ |