summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorunknown <mikron@mikael-ronstr-ms-dator.local>2007-05-07 15:25:24 +0200
committerunknown <mikron@mikael-ronstr-ms-dator.local>2007-05-07 15:25:24 +0200
commitef4445187c7d3027215d39a3af92d40b58065d71 (patch)
treed960998d1274f6d506aecff8d945653e0bff6d6c /libmysqld
parent632e03f86dbc4cdcfcefb42bc8d47f59cd2d882d (diff)
downloadmariadb-git-ef4445187c7d3027215d39a3af92d40b58065d71.tar.gz
Fix SCI Transporter
config/ac-macros/ha_ndbcluster.m4: Fix SCI Transporter build part libmysqld/Makefile.am: Fix SCI Transporter build part libmysqld/examples/Makefile.am: Fix SCI Transporter build part
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/Makefile.am2
-rw-r--r--libmysqld/examples/Makefile.am3
2 files changed, 3 insertions, 2 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 95e3e539eee..81da1e43cc9 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -81,7 +81,7 @@ INC_LIB= $(top_builddir)/regex/libregex.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a \
$(top_builddir)/dbug/libdbug.a \
- $(top_builddir)/vio/libvio.a
+ $(top_builddir)/vio/libvio.a @NDB_SCI_LIBS@
#
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am
index f30951a5d81..e0dd8491688 100644
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -35,7 +35,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 @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)
+LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) \
+ @NDB_SCI_LIBS@
mysqltest_embedded_LINK = $(CXXLINK)
mysqltest_embedded_SOURCES = mysqltest.c