Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1

into mc05.(none):/space/tomas/mysql-4.1

3 files changed, 62 insertions, 0 deletions

diff --git a/acconfig.h b/acconfig.h
index b254b3263fd..88c9e54e713 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -149,6 +149,9 @@
 /* Do we use user level threads */
 #undef HAVE_mit_thread
 
+/* Using Ndb Cluster DB */
+#undef HAVE_NDBCLUSTER_DB
+
 /* For some non posix threads */
 #undef HAVE_NONPOSIX_PTHREAD_GETSPECIFIC
 
diff --git a/acinclude.m4 b/acinclude.m4
index 2eb45b2e8ce..a67273f3ed8 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1302,6 +1302,47 @@ dnl ---------------------------------------------------------------------------
 dnl END OF MYSQL_CHECK_INNODB SECTION
 dnl ---------------------------------------------------------------------------
 
+dnl ---------------------------------------------------------------------------
+dnl Macro: MYSQL_CHECK_NDBCLUSTER
+dnl Sets HAVE_NDBCLUSTER_DB if --with-ndbcluster is used
+dnl ---------------------------------------------------------------------------
+                                                                                
+AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
+  AC_ARG_WITH([ndbcluster],
+              [
+  --with-ndbcluster        Include the NDB Cluster table handler],
+              [ndbcluster="$withval"],
+              [ndbcluster=no])
+                                                                                
+  AC_MSG_CHECKING([for NDB Cluster])
+                                                                                
+  have_ndbcluster=no
+  ndbcluster_includes=
+  ndbcluster_libs=
+  case "$ndbcluster" in
+    yes )
+      AC_MSG_RESULT([Using NDB Cluster])
+      AC_DEFINE(HAVE_NDBCLUSTER_DB)
+      have_ndbcluster="yes"
+      ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi"
+      ndbcluster_libs="\$(top_builddir)/ndb/lib/libNDB_API.a"
+      ndbcluster_system_libs=""
+      ;;
+    * )
+      AC_MSG_RESULT([Not using NDB Cluster])
+      ;;
+  esac
+
+  AC_SUBST(ndbcluster_includes)
+  AC_SUBST(ndbcluster_libs)
+  AC_SUBST(ndbcluster_system_libs)
+])
+                                                                                
+dnl ---------------------------------------------------------------------------
+dnl END OF MYSQL_CHECK_NDBCLUSTER SECTION
+dnl ---------------------------------------------------------------------------
+
+
 dnl By default, many hosts won't let programs access large files;
 dnl one must use special compiler options to get large-file access to work.
 dnl For more details about this brain damage please see:
diff --git a/configure.in b/configure.in
index de546d9c078..c218df7be1c 100644
--- a/configure.in
+++ b/configure.in
@@ -2618,6 +2618,7 @@ AC_DEFINE_UNQUOTED(MYSQL_DEFAULT_COLLATION_NAME,"$default_collation")
 MYSQL_CHECK_ISAM
 MYSQL_CHECK_BDB
 MYSQL_CHECK_INNODB
+MYSQL_CHECK_NDBCLUSTER
 
 # If we have threads generate some library functions and test programs
 sql_server_dirs=
@@ -2747,6 +2748,19 @@ EOF
     sql_server_dirs="$sql_server_dirs innobase"
     AC_CONFIG_SUBDIRS(innobase)
   fi
+
+  if test X"$have_ndbcluster" = Xyes
+  then
+    sql_server_dirs="$sql_server_dirs ndb"
+    echo "CONFIGURING FOR NDB CLUSTER" 
+    case $with_debug in
+    no) flag="-R" ;;
+    *)  flag="-D" ;;
+    esac
+    (cd ndb && ./configure $flag) \
+    || AC_MSG_ERROR([could not configure NDB Cluster])
+    echo "END OF NDB CLUSTER CONFIGURATION"
+  fi
   #
   # END of configuration for optional table handlers
   #
@@ -2808,6 +2822,10 @@ case $SYSTEM_TYPE in
     MAKE_BINARY_DISTRIBUTION_OPTIONS=
     ;;
 esac
+if test X"$have_ndbcluster" = Xyes
+then
+  MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster"
+fi
 AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
 
 # Output results