diff options
| author | unknown <jimw@mysql.com> | 2005-01-12 17:05:33 +0100 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-12 17:05:33 +0100 |
| commit | 78f59f6093ab25d14afb3f469698d44599d4ee2e (patch) | |
| tree | c76200768bb76751d543a6ece920ba5d0b10c829 /scripts | |
| parent | c153522d354f69206861e9ce4abe5bcc7016f541 (diff) | |
| parent | 90d6c0629fd3a83cd223ba7e106920b2d3042dd0 (diff) | |
| download | mariadb-git-78f59f6093ab25d14afb3f469698d44599d4ee2e.tar.gz | |
Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
into mysql.com:/home/jwinstead2/mysql-5.0-clean
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@!' \ |