bk commit into 4.1 tree (stewart:1.2374) BUG#11538

[Stewart Smith]

Below is the list of changes that have just been committed into a local
4.1 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.2374 05/08/03 17:52:43 stewart@stripped +1 -0
  BUG#11538 mysql compile fails with certain ndb options
  
  --with-ndb-ccflags would include "yes" as a CFLAG and pass it to GCC (who didn't agree).

  acinclude.m4
    1.135 05/08/03 17:52:36 stewart@stripped +13 -4
    Test value of --with-ndb-ccflags and don't do anything (fail with error to config.log)
    unless there is a sensible value (i.e. not "yes")

# 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/4.1/bug11538

--- 1.134/acinclude.m4	2005-04-27 03:26:48 +10:00
+++ 1.135/acinclude.m4	2005-08-03 17:52:36 +10:00
@@ -1723,10 +1723,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([])