diff options
author | unknown <tomas@mc05.(none)> | 2004-04-14 18:40:23 +0200 |
---|---|---|
committer | unknown <tomas@mc05.(none)> | 2004-04-14 18:40:23 +0200 |
commit | f76d2ce34f4947648fc910669b4639182da6dbaa (patch) | |
tree | 7d90dfa93b5b98fa528c85162ace9b616290aabf /configure.in | |
parent | 8056f41a0472079b92f1c4671a12e5d107488abc (diff) | |
parent | fd1d14a017fcbe86d641675c3de4788cefa8f28f (diff) | |
download | mariadb-git-f76d2ce34f4947648fc910669b4639182da6dbaa.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space/tomas/mysql-4.1
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 18 |
1 files changed, 18 insertions, 0 deletions
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 |