diff options
author | monty@hundin.mysql.fi <> | 2001-10-08 05:36:35 +0300 |
---|---|---|
committer | monty@hundin.mysql.fi <> | 2001-10-08 05:36:35 +0300 |
commit | 938a8dc2ef15eb0878c9a71f2f60ae521084494a (patch) | |
tree | 87a4027a65ad98a422987c566b6d394464e95623 /sql/Makefile.am | |
parent | 0c81c7ea07b8f28746fef96409eafb6995c5d7c9 (diff) | |
parent | 88aff4bf851e8f0d67cc7cd860d445e0fb234717 (diff) | |
download | mariadb-git-938a8dc2ef15eb0878c9a71f2f60ae521084494a.tar.gz |
merge
Diffstat (limited to 'sql/Makefile.am')
-rw-r--r-- | sql/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 050abfb02b6..a11b1d0c252 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -29,7 +29,7 @@ WRAPLIBS= @WRAPLIBS@ SUBDIRS = share libexec_PROGRAMS = mysqld noinst_PROGRAMS = gen_lex_hash -gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@ +gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@ LDADD = ../isam/libnisam.a \ ../merge/libmerge.a \ ../myisam/libmyisam.a \ @@ -43,7 +43,7 @@ LDADD = ../isam/libnisam.a \ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ @bdb_libs@ @innodb_libs@ @pstack_libs@ \ - @gemini_libs@ \ + @gemini_libs@ @innodb_system_libs@ \ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_strfunc.h item_timefunc.h item_uniq.h \ |