diff options
| author | unknown <guilhem@mysql.com> | 2005-02-05 18:07:50 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2005-02-05 18:07:50 +0100 |
| commit | 57902c74ecfe91f2828e062efefb79aefc70849c (patch) | |
| tree | 5ba78b925d97fe049cf5345b908bf900908799a2 /scripts/Makefile.am | |
| parent | ac1e5aba61901d457bab083a4b40928f506637d0 (diff) | |
| parent | 18dcc5ddcc21bdd7bbf83e04c1e23d821afaf06e (diff) | |
| download | mariadb-git-57902c74ecfe91f2828e062efefb79aefc70849c.tar.gz | |
Merge
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
configure.in:
Auto merged
include/mysql.h:
Auto merged
scripts/Makefile.am:
Auto merged
mysql-test/r/drop_temp_table.result:
SCCS merged
sql/sql_base.cc:
SCCS merged
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 221fab13635..c26cc8afedb 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -140,6 +140,9 @@ SUFFIXES = .sh -e 's!@''IS_LINUX''@!@IS_LINUX@!' \ -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \ -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \ + -e 's!@''STATIC_NSS_FLAGS''@!@STATIC_NSS_FLAGS@!' \ + -e 's!@''NON_THREADED_LIBS''@!@NON_THREADED_LIBS@!' \ + -e 's!@''ZLIB_DEPS''@!@ZLIB_DEPS@!' \ -e "s!@MAKE@!$(MAKE)!" \ $< > $@-t @CHMOD@ +x $@-t |