diff options
| author | dli@dev3-164.dev.cn.tlan <> | 2007-04-24 10:28:11 +0800 |
|---|---|---|
| committer | dli@dev3-164.dev.cn.tlan <> | 2007-04-24 10:28:11 +0800 |
| commit | c98aea71e4107ea9764146c698a4e02a54250b75 (patch) | |
| tree | ba784af3cc1159be5311f792c03d5ebe35b958aa /storage | |
| parent | ff7493b3b649e0d52ae98599cb1c6267f55c8cce (diff) | |
| parent | feaf6d1615906c98436c2b1c180aa35c39c83e28 (diff) | |
| download | mariadb-git-c98aea71e4107ea9764146c698a4e02a54250b75.tar.gz | |
Merge dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-23137
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/config/common.mk.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/ndb/config/common.mk.am b/storage/ndb/config/common.mk.am index 5ed3855f31e..9633a52e91f 100644 --- a/storage/ndb/config/common.mk.am +++ b/storage/ndb/config/common.mk.am @@ -25,3 +25,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) |