diff options
| author | unknown <stewart@willster.(none)> | 2006-10-16 17:01:01 +1000 |
|---|---|---|
| committer | unknown <stewart@willster.(none)> | 2006-10-16 17:01:01 +1000 |
| commit | 4154eb9abef5b41fc5eaf735cb46901ca23fa908 (patch) | |
| tree | 5d67c42ba2a84da833c18dfe355221f260c470d3 /config | |
| parent | 405c3c9abd64d2e7c74a1bb85c829aaa034a94c6 (diff) | |
| download | mariadb-git-4154eb9abef5b41fc5eaf735cb46901ca23fa908.tar.gz | |
BUG#21253 NdbApi.h should not include my_config.h
config/ac-macros/ha_ndbcluster.m4:
re-introduce NDB_SIZEOF substitutions to prevent NdbApi depending on my_config
which causes problems for autotools enabled ndbapi programs
storage/ndb/include/ndb_types.h.in:
remove dependency on my_config.h that was causing problems for ndbapi programs
using autoconf
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/ha_ndbcluster.m4 | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4 index ee31fa9fca2..a722f8f1d7d 100644 --- a/config/ac-macros/ha_ndbcluster.m4 +++ b/config/ac-macros/ha_ndbcluster.m4 @@ -308,6 +308,19 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ AC_SUBST(NDB_DEFS) AC_SUBST(ndb_cxxflags_fix) + NDB_SIZEOF_CHARP="$ac_cv_sizeof_charp" + NDB_SIZEOF_CHAR="$ac_cv_sizeof_char" + NDB_SIZEOF_SHORT="$ac_cv_sizeof_short" + NDB_SIZEOF_INT="$ac_cv_sizeof_int" + NDB_SIZEOF_LONG="$ac_cv_sizeof_long" + NDB_SIZEOF_LONG_LONG="$ac_cv_sizeof_long_long" + AC_SUBST([NDB_SIZEOF_CHARP]) + AC_SUBST([NDB_SIZEOF_CHAR]) + AC_SUBST([NDB_SIZEOF_SHORT]) + AC_SUBST([NDB_SIZEOF_INT]) + AC_SUBST([NDB_SIZEOF_LONG]) + AC_SUBST([NDB_SIZEOF_LONG_LONG]) + AC_CONFIG_FILES(storage/ndb/include/Makefile dnl storage/ndb/src/Makefile storage/ndb/src/common/Makefile dnl storage/ndb/docs/Makefile dnl |