ndb fixes see files

acconfig.h:
  added switched for shm sci in ndb
acinclude.m4:
  added switched for shm sci in ndb
configure.in:
  added dependency for ndblibs to mysql server
ndb/src/common/transporter/Makefile.am:
  small fix
ndb/src/common/transporter/Transporter.hpp:
  ndb_global for sci and shm defines

1 files changed, 39 insertions, 0 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 27e1ae91189..1d2b7d4d11d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1337,6 +1337,45 @@ dnl Macro: MYSQL_CHECK_NDBCLUSTER
 dnl Sets HAVE_NDBCLUSTER_DB if --with-ndbcluster is used
 dnl ---------------------------------------------------------------------------
                                                                                 
+AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
+  AC_ARG_WITH([ndb-shm],
+              [
+  --with-ndb-shm        Include the NDB Cluster shared memory transporter],
+              [ndb-shm="$withval"],
+              [ndb-shm=no])
+  AC_ARG_WITH([ndb-sci],
+              [
+  --with-ndb-sci        Include the NDB Cluster sci transporter],
+              [ndb-sci="$withval"],
+              [ndb-sci=no])
+                                                                                
+  AC_MSG_CHECKING([for NDB Cluster options])
+                                                                                
+  have_ndb_shm=no
+  case "$ndb-shm" in
+    yes )
+      AC_MSG_RESULT([Including NDB Cluster shared memory transporter])
+      AC_DEFINE(NDB_SHM_TRANSPORTER)
+      have_ndb_shm="yes"
+      ;;
+    * )
+      AC_MSG_RESULT([Not including NDB Cluster shared memory transporter])
+      ;;
+  esac
+
+  have_ndb_sci=no
+  case "$ndb-sci" in
+    yes )
+      AC_MSG_RESULT([Including NDB Cluster sci transporter])
+      AC_DEFINE(NDB_SCI_TRANSPORTER)
+      have_ndb_sci="yes"
+      ;;
+    * )
+      AC_MSG_RESULT([Not including NDB Cluster sci transporter])
+      ;;
+  esac
+])
+
 AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
   AC_ARG_WITH([ndbcluster],
               [