diff options
| author | mikron@mikael-ronstr-ms-dator.local <> | 2007-05-07 15:39:36 +0200 |
|---|---|---|
| committer | mikron@mikael-ronstr-ms-dator.local <> | 2007-05-07 15:39:36 +0200 |
| commit | 8a83924eb6bbccbec309807a26c803f74bcb4bfc (patch) | |
| tree | 74e4d9d386e521284ecc05b8002379d9056c7a82 /libmysqld | |
| parent | 5f9d1cf77c5e44e55e7f87d3fe91a29f64d8b505 (diff) | |
| parent | ad11366a2fc42f7cda0d2502c7adac45d599ecd7 (diff) | |
| download | mariadb-git-8a83924eb6bbccbec309807a26c803f74bcb4bfc.tar.gz | |
Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndb
into mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 1 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index cf5971affe4..024b85eed8e 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -95,6 +95,7 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ $(top_builddir)/strings/libmystrings.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/vio/libvio.a \ + @NDB_SCI_LIBS@ \ @mysql_plugin_libs@ \ $(yassl_inc_libs) diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index 3e4769c564d..ec5bbbb86e5 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -36,7 +36,8 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \ -I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \ $(openssl_includes) LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs) -LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) +LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \ + @NDB_SCI_LIBS@ mysqltest_embedded_LINK = $(CXXLINK) mysqltest_embedded_SOURCES = mysqltest.c |