diff options
| author | unknown <stewart@mysql.com> | 2005-08-03 17:52:43 +1000 |
|---|---|---|
| committer | unknown <stewart@mysql.com> | 2005-08-03 17:52:43 +1000 |
| commit | 02a4784390a4ef02f1bc17ea9b824ba8b3678250 (patch) | |
| tree | f47b62d0635345c629a43a0025e3b94a84eefc01 /acinclude.m4 | |
| parent | bcaff83722efd083d4ccba37fe7b35cb4464b0f8 (diff) | |
| download | mariadb-git-02a4784390a4ef02f1bc17ea9b824ba8b3678250.tar.gz | |
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:
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")
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index f868489f2d2..9c7271f7cc9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1723,10 +1723,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([]) |