diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-15 12:40:32 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-15 12:40:32 +0000 |
| commit | 595d467d0c8052c507894fce843a39fdca3070ce (patch) | |
| tree | ee9f6698fecd6c7653b7fc0f8668138e23025c75 /acinclude.m4 | |
| parent | fe37a1472c22b0a48244b932664925cad68f3e96 (diff) | |
| download | mariadb-git-595d467d0c8052c507894fce843a39fdca3070ce.tar.gz | |
changed compile order, mysqladmin with ndbcluster extensions needs ndb to be compiled first
added libs variable for ndbmgmclient used by mysqladmin
add linkage with @ndb_mgmclient_libs@
additional options for ndbcluster
added support for managing the cluster to mysqladmin
added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
Makefile.am:
changed compile order, mysqladming with ndbcluster extensions needs ndb to be compiled first
acinclude.m4:
added libs variable for ndbmgmclient used by mysqladmin
client/Makefile.am:
add linkage with @ndb_mgmclient_libs@
client/client_priv.h:
additional options for ndbcluster
client/mysqladmin.c:
added support for managing the cluster to mysqladmin
configure.in:
added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
include/my_global.h:
use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 448bf7a2653..81917372206 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1678,6 +1678,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [ have_ndbcluster=no ndbcluster_includes= ndbcluster_libs= + ndb_mgmclient_libs= case "$ndbcluster" in yes ) AC_MSG_RESULT([Using NDB Cluster]) @@ -1686,6 +1687,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [ ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi" ndbcluster_libs="\$(top_builddir)/ndb/src/.libs/libndbclient.a" ndbcluster_system_libs="" + ndb_mgmclient_libs="\$(top_builddir)/ndb/src/mgmclient/libndbmgmclient.la" MYSQL_CHECK_NDB_OPTIONS ;; * ) @@ -1697,6 +1699,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [ AC_SUBST(ndbcluster_includes) AC_SUBST(ndbcluster_libs) AC_SUBST(ndbcluster_system_libs) + AC_SUBST(ndb_mgmclient_libs) ]) dnl --------------------------------------------------------------------------- |