diff options
| author | acurtis@xiphis.org <> | 2006-04-24 13:36:15 -0700 |
|---|---|---|
| committer | acurtis@xiphis.org <> | 2006-04-24 13:36:15 -0700 |
| commit | 53d4594cfe03a9b440edf09639635a024e04b079 (patch) | |
| tree | 8d426c8740820381d4c07c02035f4a4bf29c2fa3 /config/ac-macros/ha_ndbcluster.m4 | |
| parent | afdb3faae15e2b992fb09ce9c0cb7d475bdb6902 (diff) | |
| parent | 91801e5cc051b60c1d9670438f614c73d759f7da (diff) | |
| download | mariadb-git-53d4594cfe03a9b440edf09639635a024e04b079.tar.gz | |
Merge xiphis.org:/home/antony/work2/wl3201.3
into xiphis.org:/home/antony/work2/wl3201.merge
Diffstat (limited to 'config/ac-macros/ha_ndbcluster.m4')
| -rw-r--r-- | config/ac-macros/ha_ndbcluster.m4 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4 index 8e839d8fee9..c7e163e065f 100644 --- a/config/ac-macros/ha_ndbcluster.m4 +++ b/config/ac-macros/ha_ndbcluster.m4 @@ -191,7 +191,6 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ ndbcluster_libs="\$(top_builddir)/storage/ndb/src/.libs/libndbclient.a" ndbcluster_system_libs="" ndb_mgmclient_libs="\$(top_builddir)/storage/ndb/src/mgmclient/libndbmgmclient.la" - mysql_se_objs="$mysql_se_objs ha_ndbcluster_binlog.o" MYSQL_CHECK_NDB_OPTIONS NDBCLUSTER_WORKAROUNDS @@ -282,9 +281,6 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ ndb_bin_am_ldflags="" fi - mysql_se_libs="$mysql_se_libs $ndbcluster_libs $ndbcluster_system_libs" - mysql_se_libs="$mysql_se_libs $NDB_SCI_LIBS" - AC_SUBST(NDB_VERSION_MAJOR) AC_SUBST(NDB_VERSION_MINOR) AC_SUBST(NDB_VERSION_BUILD) @@ -302,6 +298,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ AC_SUBST(ndbcluster_libs) AC_SUBST(ndbcluster_system_libs) AC_SUBST(ndb_mgmclient_libs) + AC_SUBST(NDB_SCI_LIBS) AC_SUBST(ndb_transporter_opt_objs) AC_SUBST(ndb_port) |