bk commit into 5.0 tree (stewart:1.1983) BUG#11538

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1983 05/08/18 16:47:41 stewart@stripped +1 -0
  Fix merge of BUG#11538 fix.

  config/ac-macros/ha_ndbcluster.m4
    1.6 05/08/18 16:47:32 stewart@stripped +13 -4
    Merge fix for BUG#11538 fix.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	kennedy.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/main

--- 1.5/config/ac-macros/ha_ndbcluster.m4	2005-01-21 18:41:32 +11:00
+++ 1.6/config/ac-macros/ha_ndbcluster.m4	2005-08-18 16:47:32 +10:00
@@ -62,10 +62,19 @@
               [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([])