diff options
| -rw-r--r-- | config/ac-macros/plugins.m4 | 2 | ||||
| -rw-r--r-- | configure.in | 29 |
2 files changed, 8 insertions, 23 deletions
diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4 index 4bf9292547d..cfc5f8dbcbe 100644 --- a/config/ac-macros/plugins.m4 +++ b/config/ac-macros/plugins.m4 @@ -406,7 +406,7 @@ dnl Although this is "pretty", it breaks libmysqld build mysql_plugin_dirs="$mysql_plugin_dirs $6" m4_syscmd(test -f "$6/configure") ifelse(m4_sysval, 0, - [other_configures="$other_configures $6/configure"], + [AC_CONFIG_SUBDIRS($6)], [AC_CONFIG_FILES($6/Makefile)] ) ifelse(m4_substr($6, 0, 8), [storage/], diff --git a/configure.in b/configure.in index be6f3c8eaec..120863dafbd 100644 --- a/configure.in +++ b/configure.in @@ -2474,10 +2474,6 @@ AC_SUBST(netware_dir) AC_SUBST(linked_netware_sources) AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware") -# Ensure that table handlers gets all modifications to CFLAGS/CXXFLAGS -export CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR -ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'" - if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no" then AC_DEFINE([THREAD], [1], @@ -2527,22 +2523,6 @@ AC_SUBST(CC) AC_SUBST(GXX) # Set configuration options for make_binary_distribution - -CONF_ARGS= -case $SYSTEM_TYPE in - *netware*) - MAKE_BINARY_DISTRIBUTION_OPTIONS=--no-strip - CONF_ARGS=--host="$MACHINE_TYPE-$SYSTEM_TYPE" - ;; - *) - MAKE_BINARY_DISTRIBUTION_OPTIONS= - ;; -esac - -for CONF in $other_configures; do - (cd `dirname $CONF`; ./`basename $CONF` $CONF_ARGS --build=$build_alias) -done - AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS) # Output results @@ -2559,8 +2539,13 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl support-files/MacOSX/Makefile mysql-test/Makefile dnl mysql-test/ndb/Makefile netware/Makefile dnl include/mysql_version.h plugin/Makefile win/Makefile) - AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) - AC_OUTPUT + +AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) + +# Ensure that table handlers gets all modifications to CFLAGS/CXXFLAGS +AC_CONFIG_COMMANDS_POST(ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'") + +AC_OUTPUT echo echo "MySQL has a Web site at http://www.mysql.com/ which carries details on the" |