ndb fixes see files

acconfig.h

@@ -155,6 +155,12 @@
 /* Using Ndb Cluster DB */
 #undef HAVE_NDBCLUSTER_DB
 
+/* Including Ndb Cluster DB shared memory transporter */
+#undef NDB_SHM_TRANSPORTER
+
+/* Including Ndb Cluster DB sci transporter */
+#undef NDB_SCI_TRANSPORTER
+
 /* For some non posix threads */
 #undef HAVE_NONPOSIX_PTHREAD_GETSPECIFIC
 

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],
               [

configure.in

@@ -1120,7 +1120,7 @@ dnl Is this the right match for DEC OSF on alpha?
         sql/Makefile.in)
           # Use gen_lex_hash.linux instead of gen_lex_hash
           # Add library dependencies to mysqld_DEPENDENCIES
-          lib_DEPENDENCIES="\$(bdb_libs_with_path) \$(innodb_libs) \$(pstack_libs) \$(innodb_system_libs) \$(openssl_libs)"
+          lib_DEPENDENCIES="\$(bdb_libs_with_path) \$(innodb_libs) \$(ndbcluster_libs) \$(pstack_libs) \$(innodb_system_libs) \$(openssl_libs)"
           cat > $filesed << EOF
 s,\(^.*\$(MAKE) gen_lex_hash\)\$(EXEEXT),#\1,
 s,\(\./gen_lex_hash\)\$(EXEEXT),\1.linux,
@@ -2925,9 +2925,6 @@ AC_SUBST(mgmapiincludedir)
   #AC_SUBST(NDB_TYPE_KERNEL)
   #AC_SUBST(NDB_TYPE_UTIL)
 
-#  define(NDB_MAKEFILES, [ dnl
-#   ])
-
 AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
 
 # Output results

ndb/src/common/transporter/Makefile.am

@@ -10,9 +10,10 @@ libtransporter_la_SOURCES = \
 
 #	SHM_Transporter.cpp
 
+INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter
+
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_util.mk.am
-INCLUDES += -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

ndb/src/common/transporter/Transporter.hpp

@@ -17,6 +17,8 @@
 #ifndef Transporter_H
 #define Transporter_H
 
+#include <ndb_global.h>
+
 #include <TransporterCallback.hpp>
 #include "TransporterDefinitions.hpp"
 #include "Packer.hpp"