diff options
| author | unknown <dli@dev3-76.dev.cn.tlan> | 2006-11-14 15:58:06 +0800 |
|---|---|---|
| committer | unknown <dli@dev3-76.dev.cn.tlan> | 2006-11-14 15:58:06 +0800 |
| commit | 2b76ee2435cd9c436dfc592d76317f5eff9392a5 (patch) | |
| tree | ebda4754220dbf0bb91d3813c35e2ea5386ad1da | |
| parent | 479ffe15cb7b0b41d812d2a8469a1117b8e23664 (diff) | |
| download | mariadb-git-2b76ee2435cd9c436dfc592d76317f5eff9392a5.tar.gz | |
ndb - fix for BUG#23137, ha_ndbcluster.m4 bug.
Because NDB_CXXFLAGS is just used in ndb engine, moved NDB_CXXFLAGS from ha_ndbcluster.m4 to ndb/config/common.mk.am.
config/ac-macros/ha_ndbcluster.m4:
removed NDB_CXXFLAGS.
storage/ndb/config/common.mk.am:
Added NDB_CXXFLAGS to AM_CXXFLAGS.
| -rw-r--r-- | config/ac-macros/ha_ndbcluster.m4 | 1 | ||||
| -rw-r--r-- | storage/ndb/config/common.mk.am | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4 index ee31fa9fca2..0371eff6537 100644 --- a/config/ac-macros/ha_ndbcluster.m4 +++ b/config/ac-macros/ha_ndbcluster.m4 @@ -197,7 +197,6 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster" - CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)" if test "$have_ndb_debug" = "default" then have_ndb_debug=$with_debug diff --git a/storage/ndb/config/common.mk.am b/storage/ndb/config/common.mk.am index a9ff5fdfc77..fca68a87550 100644 --- a/storage/ndb/config/common.mk.am +++ b/storage/ndb/config/common.mk.am @@ -10,3 +10,5 @@ INCLUDES = $(INCLUDES_LOC) LDADD = $(LDADD_LOC) DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS) NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC) +NDB_AM_CXXFLAGS:= $(AM_CXXFLAGS) +AM_CXXFLAGS=$(NDB_AM_CXXFLAGS) $(NDB_CXXFLAGS) |