summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorunknown <stewart@mysql.com>2005-08-18 16:47:41 +1000
committerunknown <stewart@mysql.com>2005-08-18 16:47:41 +1000
commit3fad821805e5596fa619aa9087bcb8ae0509477f (patch)
tree0ae8465b05663e4792febb5075dc0731d1083809 /config
parent9649a7e464574e566fd9af2f5b6f1513a90b126d (diff)
downloadmariadb-git-3fad821805e5596fa619aa9087bcb8ae0509477f.tar.gz
Fix merge of BUG#11538 fix.
config/ac-macros/ha_ndbcluster.m4: Merge fix for BUG#11538 fix.
Diffstat (limited to 'config')
-rw-r--r--config/ac-macros/ha_ndbcluster.m417
1 files changed, 13 insertions, 4 deletions
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
index dc5e0e73558..509cd868909 100644
--- a/config/ac-macros/ha_ndbcluster.m4
+++ b/config/ac-macros/ha_ndbcluster.m4
@@ -62,10 +62,19 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
[ndb_debug="$withval"],
[ndb_debug="default"])
AC_ARG_WITH([ndb-ccflags],
- [
- --with-ndb-ccflags Extra CC options for ndb compile],
- [ndb_cxxflags_fix="$ndb_cxxflags_fix $withval"],
- [ndb_cxxflags_fix=$ndb_cxxflags_fix])
+ AC_HELP_STRING([--with-ndb-ccflags=CFLAGS],
+ [Extra CFLAGS for ndb compile]),
+ [ndb_ccflags=${withval}],
+ [ndb_ccflags=""])
+
+ case "$ndb_ccflags" in
+ "yes")
+ AC_MSG_RESULT([The --ndb-ccflags option requires a parameter (passed to CC for ndb compilation)])
+ ;;
+ *)
+ ndb_cxxflags_fix="$ndb_cxxflags_fix $ndb_ccflags"
+ ;;
+ esac
AC_MSG_CHECKING([for NDB Cluster options])
AC_MSG_RESULT([])