bk commit into 5.1 tree (serg:1.2207)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2207 06/06/15 21:43:29 serg@stripped +2 -0
  don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS
  don't add CFLAGS/CXXFLAGS to ./configure command line in config.status
  but _do_ add them before calling plugins' configure scripts

  configure.in
    1.362 06/06/15 21:42:57 serg@stripped +7 -22
    don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS
    don't add CFLAGS/CXXFLAGS to ./configure command line in config.status
    but _do_ add them before calling plugins' configure scripts

  config/ac-macros/plugins.m4
    1.16 06/06/15 21:42:57 serg@stripped +1 -1
    don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/m51

--- 1.361/configure.in	Thu Jun 15 11:40:26 2006
+++ 1.362/configure.in	Thu Jun 15 21:42:57 2006
@@ -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 
  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"

--- 1.15/config/ac-macros/plugins.m4	Wed May 10 19:57:52 2006
+++ 1.16/config/ac-macros/plugins.m4	Thu Jun 15 21:42:57 2006
@@ -406,7 +406,7 @@ dnl Although this is "pretty", it breaks
         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/],