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 /scripts | |
| 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 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
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@!' \ |