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.
parent c10719c6
...@@ -197,7 +197,6 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ ...@@ -197,7 +197,6 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster" MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --with-ndbcluster"
CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS)"
if test "$have_ndb_debug" = "default" if test "$have_ndb_debug" = "default"
then then
have_ndb_debug=$with_debug have_ndb_debug=$with_debug
......
...@@ -10,3 +10,5 @@ INCLUDES = $(INCLUDES_LOC) ...@@ -10,3 +10,5 @@ INCLUDES = $(INCLUDES_LOC)
LDADD = $(LDADD_LOC) LDADD = $(LDADD_LOC)
DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS) DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS)
NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC) NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC)
NDB_AM_CXXFLAGS:= $(AM_CXXFLAGS)
AM_CXXFLAGS=$(NDB_AM_CXXFLAGS) $(NDB_CXXFLAGS)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment