diff options
| author | mysql@mc04.(none) <> | 2004-09-16 09:21:49 +0200 |
|---|---|---|
| committer | mysql@mc04.(none) <> | 2004-09-16 09:21:49 +0200 |
| commit | d905188230ebe9f57a73bfc4069c85a5fff71630 (patch) | |
| tree | 4607d1174b87192db3af2f5f44ecde3190fb6e87 /acinclude.m4 | |
| parent | 083e4f475aa55c5bb63f36eac3e53a586df6353a (diff) | |
| parent | 72017f8dd243235115394461ca1489b5eb538331 (diff) | |
| download | mariadb-git-d905188230ebe9f57a73bfc4069c85a5fff71630.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc04.(none):/space/mysql/mysql-4.1-ndb
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 50 |
1 files changed, 32 insertions, 18 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2e0e85743b7..becbb32bfcf 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1551,16 +1551,43 @@ dnl Sets HAVE_NDBCLUSTER_DB if --with-ndbcluster is used dnl --------------------------------------------------------------------------- AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [ + AC_ARG_WITH([ndb-sci], + AC_HELP_STRING([--with-ndb-sci=DIR], + [Provide MySQL with a custom location of + sci library. Given DIR, sci library is + assumed to be in $DIR/lib and header files + in $DIR/include.]), + [mysql_sci_dir=${withval}], + [mysql_sci_dir=""]) + + case "$mysql_sci_dir" in + "no" ) + have_ndb_sci=no + AC_MSG_RESULT([-- not including sci transporter]) + ;; + * ) + if test -f "$mysql_sci_dir/lib/libsisci.a" -a \ + -f "$mysql_sci_dir/include/sisci_api.h"; then + NDB_SCI_INCLUDES="-I$mysql_sci_dir/include" + NDB_SCI_LIBS="-L$mysql_sci_dir/lib -lsisci" + AC_MSG_RESULT([-- including sci transporter]) + AC_DEFINE([NDB_SCI_TRANSPORTER], [1], + [Including Ndb Cluster DB sci transporter]) + AC_SUBST(NDB_SCI_INCLUDES) + AC_SUBST(NDB_SCI_LIBS) + have_ndb_sci="yes" + AC_MSG_RESULT([found sci transporter in $mysql_sci_dir/{include, lib}]) + else + AC_MSG_RESULT([could not find sci transporter in $mysql_sci_dir/{include, lib}]) + fi + ;; + esac + 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_ARG_WITH([ndb-test], [ --with-ndb-test Include the NDB Cluster ndbapi test programs], @@ -1593,19 +1620,6 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [ ;; esac - have_ndb_sci=no - case "$ndb_sci" in - yes ) - AC_MSG_RESULT([-- including sci transporter]) - AC_DEFINE([NDB_SCI_TRANSPORTER], [1], - [Including Ndb Cluster DB sci transporter]) - have_ndb_sci="yes" - ;; - * ) - AC_MSG_RESULT([-- not including sci transporter]) - ;; - esac - have_ndb_test=no case "$ndb_test" in yes ) |