summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-06-05 09:22:11 +0200
committerunknown <serg@serg.mylan>2004-06-05 09:22:11 +0200
commitb929e7b6a4f4aa081d954f9c8944c7384fd8a515 (patch)
treeca2d47ba3b880148a8c8c1f5e917c7aee2e5e859 /configure.in
parentc08420c8e4dfc6605c0a77ea4212afa1b000b4d7 (diff)
downloadmariadb-git-b929e7b6a4f4aa081d954f9c8944c7384fd8a515.tar.gz
do not create ndb Makefiles unless required
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in26
1 files changed, 13 insertions, 13 deletions
diff --git a/configure.in b/configure.in
index 8ffab66d80a..759ac0e151e 100644
--- a/configure.in
+++ b/configure.in
@@ -2879,7 +2879,6 @@ then
NDB_DEFS="-DNDEBUG"
CXXFLAGS="$CXXFLAGS \$(NDB_CXXFLAGS) \$(NDB_CXXFLAGS_LOC) \$(NDB_CXXFLAGS_RELEASE_LOC)"
fi
-fi
AC_SUBST([NDB_DEFS])
@@ -2902,12 +2901,7 @@ then
fi
AC_SUBST([ndb_bin_am_ldflags])
AC_SUBST([ndb_opt_test_subdirs])
-
-AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
-
-# Output results
-AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
- ndb/Makefile ndb/include/Makefile dnl
+AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl
ndb/src/Makefile ndb/src/common/Makefile dnl
ndb/tools/Makefile dnl
ndb/src/common/debugger/Makefile ndb/src/common/debugger/signaldata/Makefile dnl
@@ -2949,7 +2943,14 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
ndb/test/ndbapi/Makefile dnl
ndb/test/ndbapi/bank/Makefile dnl
ndb/test/tools/Makefile dnl
- ndb/test/run-test/Makefile dnl
+ ndb/test/run-test/Makefile mysql-test/ndb/Makefile dnl
+ )
+fi
+
+AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
+
+# Output results
+AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
strings/Makefile regex/Makefile heap/Makefile dnl
bdb/Makefile dnl
myisam/Makefile myisammrg/Makefile dnl
@@ -2962,15 +2963,14 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
merge/Makefile dbug/Makefile scripts/Makefile dnl
include/Makefile sql-bench/Makefile tools/Makefile dnl
tests/Makefile Docs/Makefile support-files/Makefile dnl
- support-files/MacOSX/Makefile mysql-test/Makefile mysql-test/ndb/Makefile dnl
+ support-files/MacOSX/Makefile mysql-test/Makefile dnl
netware/Makefile dnl
include/mysql_version.h dnl
cmd-line-utils/Makefile dnl
cmd-line-utils/libedit/Makefile dnl
- cmd-line-utils/readline/Makefile dnl
- , , [
- test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
- ])
+ cmd-line-utils/readline/Makefile)
+ AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
+ AC_OUTPUT
rm -f $AVAILABLE_LANGUAGES_ERRORS_RULES
echo