diff options
| author | unknown <mikron@mikael-ronstr-ms-dator.local> | 2007-05-07 15:46:29 +0200 |
|---|---|---|
| committer | unknown <mikron@mikael-ronstr-ms-dator.local> | 2007-05-07 15:46:29 +0200 |
| commit | e3a68d8dcc2af76706948df698d6a15a91cae379 (patch) | |
| tree | 869adda5343bb09721f83a231bcbad8871984011 /sql/Makefile.am | |
| parent | 1f07de22e097c6e32b29042ba45c66b2293ce952 (diff) | |
| download | mariadb-git-e3a68d8dcc2af76706948df698d6a15a91cae379.tar.gz | |
Manual merge
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 465e5c843f4..d280b22f493 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -33,7 +33,7 @@ SUPPORTING_LIBS = $(top_builddir)/vio/libvio.a \ $(top_builddir)/regex/libregex.a \ $(top_builddir)/strings/libmystrings.a mysqld_DEPENDENCIES= @mysql_plugin_libs@ $(SUPPORTING_LIBS) -LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ +LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ @pstack_libs@ \ @mysql_plugin_libs@ \ |