make distcheck and cosmetic fixes

4 files changed, 307 insertions, 301 deletions

diff --git a/config/ac-macros/ha_berkeley.m4 b/config/ac-macros/ha_berkeley.m4
index c389077ea8b..c7d99bd8e03 100644
--- a/config/ac-macros/ha_berkeley.m4
+++ b/config/ac-macros/ha_berkeley.m4
@@ -8,23 +8,20 @@ dnl ---------------------------------------------------------------------------
 
 AC_DEFUN([MYSQL_SETUP_BERKELEY_DB], [
   AC_ARG_WITH([berkeley-db],
-              [
-  --with-berkeley-db[=DIR]
-                          Use BerkeleyDB located in DIR],
+              AS_HELP_STRING([--with-berkeley-db[[[[[=DIR]]]]]],
+                             [Use BerkeleyDB located in DIR]),
               [bdb="$withval"],
               [bdb=yes])
 
   AC_ARG_WITH([berkeley-db-includes],
-              [
-  --with-berkeley-db-includes=DIR
-                          Find Berkeley DB headers in DIR],
+              AS_HELP_STRING([--with-berkeley-db-includes=DIR],
+                             [Find Berkeley DB headers in DIR]),
               [bdb_includes="$withval"],
               [bdb_includes=default])
 
   AC_ARG_WITH([berkeley-db-libs],
-              [
-  --with-berkeley-db-libs=DIR
-                          Find Berkeley DB libraries in DIR],
+              AS_HELP_STRING([--with-berkeley-db-libs=DIR],
+                             [Find Berkeley DB libraries in DIR]),
               [bdb_libs="$withval"],
               [bdb_libs=default])
 
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
index c7e163e065f..aee445f8d58 100644
--- a/config/ac-macros/ha_ndbcluster.m4
+++ b/config/ac-macros/ha_ndbcluster.m4
@@ -308,7 +308,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
   AC_SUBST(NDB_DEFS)
   AC_SUBST(ndb_cxxflags_fix)
 
-  AC_CONFIG_FILES(storage/ndb/Makefile storage/ndb/include/Makefile dnl
+  AC_CONFIG_FILES(storage/ndb/include/Makefile dnl
    storage/ndb/src/Makefile storage/ndb/src/common/Makefile dnl
    storage/ndb/docs/Makefile dnl
    storage/ndb/tools/Makefile dnl
diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4
index d8199f5970e..a2f70071e2d 100644
--- a/config/ac-macros/misc.m4
+++ b/config/ac-macros/misc.m4
@@ -675,8 +675,8 @@ dnl Sets BIG_TABLES if --with-big-tables is used
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([MYSQL_CHECK_BIG_TABLES], [
   AC_ARG_WITH([big-tables],
-              [
-  --with-big-tables       Support tables with more than 4 G rows even on 32 bit platforms],
+  AS_HELP_STRING([--with-big-tables],
+              [Support tables with more than 4 G rows even on 32 bit platforms]),
               [bigtables="$withval"],
               [bigtables=no])
   AC_MSG_CHECKING([for big tables support])
@@ -703,8 +703,8 @@ dnl Sets MAX_INDEXES
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([MYSQL_CHECK_MAX_INDEXES], [
   AC_ARG_WITH([max-indexes],
-              [
-  --with-max-indexes=\#      Sets the maximum number of indexes per table, default 64],
+              AS_HELP_STRING([--with-max-indexes=N],
+                             [Sets the maximum number of indexes per table, default 64]),
               [max_indexes="$withval"],
               [max_indexes=64])
   AC_MSG_CHECKING([max indexes per table])
diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4
index 8ea5aca2595..51f83e19e5f 100644
--- a/config/ac-macros/plugins.m4
+++ b/config/ac-macros/plugins.m4
@@ -20,28 +20,28 @@ dnl   Adds module as member to configuration groups (if specified)
 dnl
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN([MYSQL_MODULE],[ dnl
+AC_DEFUN([MYSQL_MODULE],[
  _MYSQL_MODULE(
   [$1],
   [__MYSQL_MODULE_]AS_TR_CPP([$1])[__],
   m4_default([$2], [$1 plugin]),
   m4_default([$3], [plugin for $1]),
   m4_default([$4], []),
- ) dnl
+ )
 ])
 
-AC_DEFUN([_MYSQL_MODULE],[ dnl
- m4_ifdef([$2], [ dnl
-  AC_FATAL([[Duplicate MYSQL_MODULE declaration for ]][$3]) dnl
+AC_DEFUN([_MYSQL_MODULE],[
+ m4_ifdef([$2], [
+  AC_FATAL([[Duplicate MYSQL_MODULE declaration for ]][$3])
  ],[ dnl 
-  m4_define([$2], [$1]) dnl
-  _MYSQL_PLUGAPPEND([__mysql_plugin_list__],[$1]) dnl
-  m4_define([MYSQL_MODULE_NAME_]AS_TR_CPP([$1]), [$3]) dnl
-  m4_define([MYSQL_MODULE_DESC_]AS_TR_CPP([$1]), [$4]) dnl
-  ifelse([$5], [], [], [ dnl
-   _MYSQL_PLUGAPPEND_OPTS([$1], $5) dnl
-  ]) dnl
- ]) dnl
+  m4_define([$2], [$1])
+  _MYSQL_PLUGAPPEND([__mysql_plugin_list__],[$1])
+  m4_define([MYSQL_MODULE_NAME_]AS_TR_CPP([$1]), [$3])
+  m4_define([MYSQL_MODULE_DESC_]AS_TR_CPP([$1]), [$4])
+  ifelse([$5], [], [], [
+   _MYSQL_PLUGAPPEND_OPTS([$1], $5)
+  ])
+ ])
 ])
 
 
@@ -53,18 +53,18 @@ dnl   Short cut for storage engine declarations
 dnl
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN([MYSQL_STORAGE_ENGINE],[ dnl
- MYSQL_MODULE([$1], [$3], [$4], [[$5]]) dnl
- MYSQL_MODULE_DEFINE([$1], [WITH_]AS_TR_CPP([$1])[_STORAGE_ENGINE]) dnl
- ifelse([$2],[no],[],[ dnl
-  _MYSQL_LEGACY_STORAGE_ENGINE([$1],m4_default([$2], [$1-storage-engine])) dnl
- ]) dnl
+AC_DEFUN([MYSQL_STORAGE_ENGINE],[
+ MYSQL_MODULE([$1], [$3], [$4], [[$5]])
+ MYSQL_MODULE_DEFINE([$1], [WITH_]AS_TR_CPP([$1])[_STORAGE_ENGINE])
+ ifelse([$2],[no],[],[
+  _MYSQL_LEGACY_STORAGE_ENGINE([$1],m4_default([$2], [$1-storage-engine]))
+ ])
 ])
 
 AC_DEFUN([_MYSQL_LEGACY_STORAGE_ENGINE],[
 if test "[${with_]m4_bpatsubst($2, -, _)[+set}]" = set; then
   [with_module_]m4_bpatsubst($1, -, _)="[$with_]m4_bpatsubst($2, -, _)"
-fi dnl
+fi
 ])
 
 
@@ -76,9 +76,9 @@ dnl   When a plugin module is to be statically linked, define the C macro
 dnl
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN([MYSQL_MODULE_DEFINE],[ dnl
- REQUIRE_PLUGIN([$1]) dnl
- m4_define([MYSQL_MODULE_DEFINE_]AS_TR_CPP([$1]), [$2]) dnl
+AC_DEFUN([MYSQL_MODULE_DEFINE],[
+ REQUIRE_PLUGIN([$1])
+ m4_define([MYSQL_MODULE_DEFINE_]AS_TR_CPP([$1]), [$2])
 ])
 
 
@@ -90,9 +90,9 @@ dnl   Adds a directory to the build process
 dnl
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN([MYSQL_MODULE_DIRECTORY],[ dnl
- REQUIRE_PLUGIN([$1]) dnl
- m4_define([MYSQL_MODULE_DIRECTORY_]AS_TR_CPP([$1]), [$2]) dnl
+AC_DEFUN([MYSQL_MODULE_DIRECTORY],[
+ REQUIRE_PLUGIN([$1])
+ m4_define([MYSQL_MODULE_DIRECTORY_]AS_TR_CPP([$1]), [$2])
 ])
 
 
@@ -104,9 +104,9 @@ dnl   Declare the name for the static library
 dnl
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN([MYSQL_MODULE_STATIC],[ dnl
- REQUIRE_PLUGIN([$1]) dnl
- m4_define([MYSQL_MODULE_STATIC_]AS_TR_CPP([$1]), [$2]) dnl
+AC_DEFUN([MYSQL_MODULE_STATIC],[
+ REQUIRE_PLUGIN([$1])
+ m4_define([MYSQL_MODULE_STATIC_]AS_TR_CPP([$1]), [$2])
 ])
 
 
@@ -118,9 +118,9 @@ dnl   Declare the name for the shared library
 dnl
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN([MYSQL_MODULE_DYNAMIC],[ dnl
- REQUIRE_PLUGIN([$1]) dnl
- m4_define([MYSQL_MODULE_DYNAMIC_]AS_TR_CPP([$1]), [$2]) dnl
+AC_DEFUN([MYSQL_MODULE_DYNAMIC],[
+ REQUIRE_PLUGIN([$1])
+ m4_define([MYSQL_MODULE_DYNAMIC_]AS_TR_CPP([$1]), [$2])
 ])
 
 
@@ -132,20 +132,20 @@ dnl   Marks the specified plugin as a mandatory module
 dnl
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN([MYSQL_MODULE_MANDATORY],[ dnl
- REQUIRE_PLUGIN([$1]) dnl
+AC_DEFUN([MYSQL_MODULE_MANDATORY],[
+ REQUIRE_PLUGIN([$1])
  _MYSQL_MODULE_MANDATORY([$1],
   [MYSQL_MODULE_MANDATORY_]AS_TR_CPP([$1]),
   [MYSQL_MODULE_DISABLED_]AS_TR_CPP([$1])
- ) dnl
+ )
 ])
 
-AC_DEFUN([_MYSQL_MODULE_MANDATORY],[ dnl
- m4_define([$2], [yes]) dnl
- m4_ifdef([$3], [ dnl
-  AC_WARNING([syntax],[Mandatory plugin $1 has been disabled]) dnl
-  m4_undefine([$2]) dnl
- ]) dnl
+AC_DEFUN([_MYSQL_MODULE_MANDATORY],[
+ m4_define([$2], [yes])
+ m4_ifdef([$3], [
+  AC_WARNING([syntax],[Mandatory plugin $1 has been disabled])
+  m4_undefine([$2])
+ ])
 ])
 
 
@@ -157,20 +157,20 @@ dnl   Marks the specified plugin as a disabled module
 dnl
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN([MYSQL_MODULE_DISABLED],[ dnl
- REQUIRE_PLUGIN([$1]) dnl
+AC_DEFUN([MYSQL_MODULE_DISABLED],[
+ REQUIRE_PLUGIN([$1])
  _MYSQL_MODULE_DISABLED([$1], 
   [MYSQL_MODULE_DISABLED_]AS_TR_CPP([$1]),
   [MYSQL_MODULE_MANDATORY_]AS_TR_CPP([$1])
- ) dnl
+ )
 ])
 
-AC_DEFUN([_MYSQL_MODULE_DISABLED],[ dnl
- m4_define([$2], [yes]) dnl
- m4_ifdef([$3], [ dnl
-  AC_FATAL([attempt to disable mandatory plugin $1]) dnl
-  m4_undefine([$2]) dnl
- ]) dnl
+AC_DEFUN([_MYSQL_MODULE_DISABLED],[
+ m4_define([$2], [yes])
+ m4_ifdef([$3], [
+  AC_FATAL([attempt to disable mandatory plugin $1])
+  m4_undefine([$2])
+ ])
 ])
 
 
@@ -185,21 +185,21 @@ dnl   here too!
 dnl
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN([MYSQL_MODULE_DEPENDS],[ dnl
- REQUIRE_PLUGIN([$1]) dnl
- ifelse($#, 0, [], $#, 1, [ dnl
-  AC_FATAL([[bad number of arguments]]) dnl
- ], $#, 2, [ dnl
-  _MYSQL_MODULE_DEPEND([$1],[$2]) dnl
- ],[ dnl
-  _MYSQL_MODULE_DEPEND([$1],[$2]) dnl
-  MYSQL_MODULE_DEPENDS([$1], m4_shift(m4_shift($@))) dnl
+AC_DEFUN([MYSQL_MODULE_DEPENDS],[
+ REQUIRE_PLUGIN([$1])
+ ifelse($#, 0, [], $#, 1, [
+  AC_FATAL([[bad number of arguments]])
+ ], $#, 2, [
+  _MYSQL_MODULE_DEPEND([$1],[$2])
+ ],[
+  _MYSQL_MODULE_DEPEND([$1],[$2])
+  MYSQL_MODULE_DEPENDS([$1], m4_shift(m4_shift($@)))
  ])
 ])
 
-AC_DEFUN([_MYSQL_MODULE_DEPEND],[ dnl
- REQUIRE_PLUGIN([$2]) dnl
- _MYSQL_PLUGAPPEND([__mysql_plugdepends_$1__],[$2]) dnl
+AC_DEFUN([_MYSQL_MODULE_DEPEND],[
+ REQUIRE_PLUGIN([$2])
+ _MYSQL_PLUGAPPEND([__mysql_plugdepends_$1__],[$2])
 ])
 
 
@@ -211,12 +211,12 @@ dnl   Declares additional actions required to configure the module
 dnl
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN([MYSQL_MODULE_ACTIONS],[ dnl
- REQUIRE_PLUGIN([$1]) dnl
- m4_ifdef([$2],[ dnl
-   m4_define([MYSQL_MODULE_ACTIONS_]AS_TR_CPP([$1]),m4_defn([$2])) dnl
- ],[ dnl
-   m4_define([MYSQL_MODULE_ACTIONS_]AS_TR_CPP([$1]), [$2]) dnl
+AC_DEFUN([MYSQL_MODULE_ACTIONS],[
+ REQUIRE_PLUGIN([$1])
+ m4_ifdef([$2],[
+   m4_define([MYSQL_MODULE_ACTIONS_]AS_TR_CPP([$1]),m4_defn([$2]))
+ ],[
+   m4_define([MYSQL_MODULE_ACTIONS_]AS_TR_CPP([$1]), [$2])
  ])
 ])
 
@@ -229,33 +229,33 @@ dnl   Called last, emits all required shell code to configure the modules
 dnl
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN([MYSQL_CONFIGURE_PLUGINS],[ dnl
- m4_ifdef([__mysql_plugin_configured__],[ dnl
-   AC_FATAL([cannot call [MYSQL_CONFIGURE_PLUGINS] multiple times]) dnl
- ],[ dnl
-   m4_define([__mysql_plugin_configured__],[done]) dnl
-   m4_ifdef([__mysql_plugin_list__],[ dnl
+AC_DEFUN([MYSQL_CONFIGURE_PLUGINS],[
+ m4_ifdef([__mysql_plugin_configured__],[
+   AC_FATAL([cannot call [MYSQL_CONFIGURE_PLUGINS] multiple times])
+ ],[
+   m4_define([__mysql_plugin_configured__],[done])
+   m4_ifdef([__mysql_plugin_list__],[
     _MYSQL_CHECK_PLUGIN_ARGS([$1])
     _MYSQL_CONFIGURE_PLUGINS(m4_bpatsubst(__mysql_plugin_list__, :, [,]))
     _MYSQL_DO_PLUGIN_ACTIONS(m4_bpatsubst(__mysql_plugin_list__, :, [,]))
     _MYSQL_POST_PLUGIN_FIXUP()
-   ]) dnl
- ]) dnl
+   ])
+ ])
 ])
 
-AC_DEFUN([_MYSQL_CONFIGURE_PLUGINS],[ dnl
- ifelse($#, 0, [], $#, 1, [ dnl
-  _MYSQL_CHECK_PLUGIN([$1]) dnl
- ],[ dnl
-  _MYSQL_CHECK_PLUGIN([$1]) dnl
-  _MYSQL_CONFIGURE_PLUGINS(m4_shift($@)) dnl
+AC_DEFUN([_MYSQL_CONFIGURE_PLUGINS],[
+ ifelse($#, 0, [], $#, 1, [
+  _MYSQL_CHECK_PLUGIN([$1])
+ ],[
+  _MYSQL_CHECK_PLUGIN([$1])
+  _MYSQL_CONFIGURE_PLUGINS(m4_shift($@))
  ])
 ])
 
-AC_DEFUN([_MYSQL_CHECK_PLUGIN],[ dnl
+AC_DEFUN([_MYSQL_CHECK_PLUGIN],[
  _DO_MYSQL_CHECK_PLUGIN(
   [$1],
-  [$1-plugin],
+  m4_bpatsubst([$1], -, _),
   [MYSQL_MODULE_NAME_]AS_TR_CPP([$1]),
   [MYSQL_MODULE_DESC_]AS_TR_CPP([$1]),
   [MYSQL_MODULE_DEFINE_]AS_TR_CPP([$1]),
@@ -265,104 +265,111 @@ AC_DEFUN([_MYSQL_CHECK_PLUGIN],[ dnl
   [MYSQL_MODULE_MANDATORY_]AS_TR_CPP([$1]),
   [MYSQL_MODULE_DISABLED_]AS_TR_CPP([$1]),
   [MYSQL_MODULE_ACTIONS_]AS_TR_CPP([$1])
- ) dnl
+ )
 ])
 
-AC_DEFUN([_DO_MYSQL_CHECK_PLUGIN],[ dnl
- m4_ifdef([$5],[ dnl
+AC_DEFUN([_DO_MYSQL_CHECK_PLUGIN],[
+ m4_ifdef([$5],[
   AH_TEMPLATE($5, [Include ]$4[ into mysqld])
  ])
- AC_MSG_CHECKING([whether to use ]$3) dnl
+ AC_MSG_CHECKING([whether to use ]$3)
  m4_ifdef([$10],[
-  if test "[$mysql_module_]m4_bpatsubst([$1], -, _)" = yes -a \
-          "[$with_module_]m4_bpatsubst([$1], -, _)" != no -o \
-          "[$with_module_]m4_bpatsubst([$1], -, _)" = yes; then
+  if test "[$mysql_module_]$2" = yes -a \
+          "[$with_module_]$2" != no -o \
+          "[$with_module_]$2" = yes; then
     AC_MSG_ERROR([disabled])
   fi
-  AC_MSG_RESULT([no]) dnl
- ],[ dnl
+  AC_MSG_RESULT([no])
+ ],[
   m4_ifdef([$9],[
-   if test "[$with_module_]m4_bpatsubst([$1], -, _)" = no; then
+   if test "[$with_module_]$2" = no; then
      AC_MSG_ERROR([cannot disable mandatory module])
    fi
-   [mysql_module_]m4_bpatsubst([$1], -, _)=yes dnl
+   [mysql_module_]$2=yes
   ])
-  if test "[$with_module_]m4_bpatsubst([$1], -, _)" != no; then
-    if test "[$mysql_module_]m4_bpatsubst([$1], -, _)" != yes -a \
-            "[$with_module_]m4_bpatsubst([$1], -, _)" != yes; then dnl
-      m4_ifdef([$8],[ dnl
+  if test "[$with_module_]$2" = no; then
+    AC_MSG_RESULT([no])
+  else
+    if test "[$mysql_module_]$2" != yes -a \
+            "[$with_module_]$2" != yes; then
+      m4_ifdef([$8],[
+       m4_ifdef([$6],[
+         if test -d "$srcdir/$6" ; then
+           mysql_plugin_dirs="$mysql_plugin_dirs $6"
+       ])
+       AC_SUBST([plugin_]$2[_shared_target], "$8")
+       AC_SUBST([plugin_]$2[_static_target], [""])
+       [with_module_]$2=yes
+       AC_MSG_RESULT([plugin])
        m4_ifdef([$6],[
-        mysql_plugin_dirs="$mysql_plugin_dirs $6" dnl
+         else
+           [mysql_module_]$2=no
+           AC_MSG_RESULT([no])
+         fi
        ])
-       AC_SUBST([plugin_]m4_bpatsubst([$1], -, _)[_shared_target], "$8")
-       AC_SUBST([plugin_]m4_bpatsubst([$1], -, _)[_static_target], [""])
-       [with_module_]m4_bpatsubst([$1], -, _)=yes
-       AC_MSG_RESULT([plugin]) dnl
       ],[
-       [with_module_]m4_bpatsubst([$1], -, _)=no
-       AC_MSG_RESULT([no]) dnl
+       [with_module_]$2=no
+       AC_MSG_RESULT([no])
       ])
-    else dnl
+    else
       m4_ifdef([$7],[
-       ifelse(m4_bregexp($7, [^lib[^.]+\.a$]), -2, [ dnl
+       ifelse(m4_bregexp($7, [^lib[^.]+\.a$]), -2, [
         m4_ifdef([$6],[
          mysql_plugin_dirs="$mysql_plugin_dirs $6"
-         mysql_plugin_libs="$mysql_plugin_libs -L[\$(top_builddir)]/$6" dnl
+         mysql_plugin_libs="$mysql_plugin_libs -L[\$(top_builddir)]/$6"
         ])
-        mysql_plugin_libs="$mysql_plugin_libs dnl
-[-l]m4_bregexp($7, [^lib\([^.]+\)], [\1])" dnl
-       ], m4_bregexp($7, [^\\\$]), 0, [ dnl
+        mysql_plugin_libs="$mysql_plugin_libs
+[-l]m4_bregexp($7, [^lib\([^.]+\)], [\1])"
+       ], m4_bregexp($7, [^\\\$]), 0, [
         m4_ifdef([$6],[
-         mysql_plugin_dirs="$mysql_plugin_dirs $6" dnl
+         mysql_plugin_dirs="$mysql_plugin_dirs $6"
         ])
-        mysql_plugin_libs="$mysql_plugin_libs $7" dnl
-       ], [ dnl
+        mysql_plugin_libs="$mysql_plugin_libs $7"
+       ], [
         m4_ifdef([$6],[
          mysql_plugin_dirs="$mysql_plugin_dirs $6"
-         mysql_plugin_libs="$mysql_plugin_libs \$(top_builddir)/$6/$7" dnl
+         mysql_plugin_libs="$mysql_plugin_libs \$(top_builddir)/$6/$7"
         ],[
-         mysql_plugin_libs="$mysql_plugin_libs $7" dnl
-        ]) dnl
-       ]) dnl
+         mysql_plugin_libs="$mysql_plugin_libs $7"
+        ])
+       ])
        m4_ifdef([$5],[
-        AC_DEFINE($5) dnl
+        AC_DEFINE($5)
        ])
-       AC_SUBST([plugin_]m4_bpatsubst([$1], -, _)[_static_target], "$7")
-       AC_SUBST([plugin_]m4_bpatsubst([$1], -, _)[_shared_target], [""]) dnl
-      ],[ dnl
+       AC_SUBST([plugin_]$2[_static_target], "$7")
+       AC_SUBST([plugin_]$2[_shared_target], [""])
+      ],[
        m4_ifdef([$6],[
-        AC_FATAL([plugin directory specified without library for ]$3) dnl
-       ],[ dnl
+        AC_FATAL([plugin directory specified without library for ]$3)
+       ],[
         m4_ifdef([$5],[
          AC_DEFINE($5)
-         AC_SUBST([plugin_]m4_bpatsubst([$1], -, _)[_static_target], ["yes"])
-         AC_SUBST([plugin_]m4_bpatsubst([$1], -, _)[_shared_target], [""]) dnl
-        ]) dnl
-       ]) dnl
+         AC_SUBST([plugin_]$2[_static_target], ["yes"])
+         AC_SUBST([plugin_]$2[_shared_target], [""])
+        ])
+       ])
       ])
-      mysql_plugin_defs="$mysql_plugin_defs, [builtin_]m4_bpatsubst([$2], -, _)"
-      [with_module_]m4_bpatsubst([$1], -, _)=yes
+      mysql_plugin_defs="$mysql_plugin_defs, [builtin_]$2[_plugin]"
+      [with_module_]$2=yes
       AC_MSG_RESULT([yes])
     fi
-  else
-    AC_MSG_RESULT([no])
-  fi dnl
- ]) dnl
+  fi
+ ])
 ])
 
-AC_DEFUN([_MYSQL_DO_PLUGIN_ACTIONS],[ dnl
- ifelse($#, 0, [], $#, 1, [ dnl
-  _MYSQL_PLUGIN_ACTIONS([$1]) dnl
- ],[ dnl
-  _MYSQL_PLUGIN_ACTIONS([$1]) dnl
-  _MYSQL_DO_PLUGIN_ACTIONS(m4_shift($@)) dnl
+AC_DEFUN([_MYSQL_DO_PLUGIN_ACTIONS],[
+ ifelse($#, 0, [], $#, 1, [
+  _MYSQL_PLUGIN_ACTIONS([$1])
+ ],[
+  _MYSQL_PLUGIN_ACTIONS([$1])
+  _MYSQL_DO_PLUGIN_ACTIONS(m4_shift($@))
  ])
 ])
 
-AC_DEFUN([_MYSQL_PLUGIN_ACTIONS],[ dnl
+AC_DEFUN([_MYSQL_PLUGIN_ACTIONS],[
  _DO_MYSQL_PLUGIN_ACTIONS(
   [$1],
-  [$1-plugin],
+  m4_bpatsubst([$1], -, _),
   [MYSQL_MODULE_NAME_]AS_TR_CPP([$1]),
   [MYSQL_MODULE_DESC_]AS_TR_CPP([$1]),
   [MYSQL_MODULE_DEFINE_]AS_TR_CPP([$1]),
@@ -372,20 +379,20 @@ AC_DEFUN([_MYSQL_PLUGIN_ACTIONS],[ dnl
   [MYSQL_MODULE_MANDATORY_]AS_TR_CPP([$1]),
   [MYSQL_MODULE_DISABLED_]AS_TR_CPP([$1]),
   [MYSQL_MODULE_ACTIONS_]AS_TR_CPP([$1])
- ) dnl
+ )
 ])
 
 
-AC_DEFUN([_DO_MYSQL_PLUGIN_ACTIONS],[ dnl
+AC_DEFUN([_DO_MYSQL_PLUGIN_ACTIONS],[
  m4_ifdef([$10], [], [
-  if test "[$with_module_]m4_bpatsubst([$1], -, _)" = yes; then
-    if test -z "[$plugin_]m4_bpatsubst([$1], -, _)[_static_target]" -a \
-            -z "[$plugin_]m4_bpatsubst([$1], -, _)[_shared_target]"; then
-      AC_MSG_ERROR([thats strange, $1 failed sanity check])
+  if test "[$with_module_]$2" = yes; then
+    if test -z "[$plugin_]$2[_static_target]" -a \
+            -z "[$plugin_]$2[_shared_target]"; then
+      AC_MSG_ERROR([that's strange, $1 failed sanity check])
     fi
     $11
-  fi dnl
- ]) dnl
+  fi
+ ])
 ])
 
 
@@ -395,17 +402,17 @@ dnl  Private helper macros
 dnl ===========================================================================
 
 
-AC_DEFUN([REQUIRE_PLUGIN],[ dnl
- _REQUIRE_PLUGIN([$1], [__MYSQL_MODULE_]AS_TR_CPP([$1])[__]) dnl
+AC_DEFUN([REQUIRE_PLUGIN],[
+ _REQUIRE_PLUGIN([$1], [__MYSQL_MODULE_]AS_TR_CPP([$1])[__])
 ])
 
-define([_REQUIRE_PLUGIN],[ dnl
- ifdef([$2],[ dnl
-  ifelse($2, [$1], [], [ dnl
-   AC_FATAL([[Misspelt MYSQL_MODULE declaration for ]][$1]) dnl
-  ]) dnl
- ],[ dnl
-  AC_FATAL([[Missing MYSQL_MODULE declaration for ]][$1]) dnl
+define([_REQUIRE_PLUGIN],[
+ ifdef([$2],[
+  ifelse($2, [$1], [], [
+   AC_FATAL([[Misspelt MYSQL_MODULE declaration for ]][$1])
+  ])
+ ],[
+  AC_FATAL([[Missing MYSQL_MODULE declaration for ]][$1])
  ])
 ])
 
@@ -413,85 +420,85 @@ define([_REQUIRE_PLUGIN],[ dnl
 dnl ---------------------------------------------------------------------------
 
 
-AC_DEFUN([_MYSQL_MODULE_META_CHECK], [ifelse($#, 0, [], $#, 1, dnl
-[_MYSQL_CHECK_PLUGIN_META([$1], [__mysql_]m4_bpatsubst($1, -, _)[_plugins__]) dnl
-], dnl
-[_MYSQL_CHECK_PLUGIN_META([$1], [__mysql_]m4_bpatsubst($1, -, _)[_plugins__]) dnl
-_MYSQL_MODULE_META_CHECK(m4_shift($@))]) dnl
+AC_DEFUN([_MYSQL_MODULE_META_CHECK], [ifelse($#, 0, [], $#, 1,
+[_MYSQL_CHECK_PLUGIN_META([$1], [__mysql_]m4_bpatsubst($1, -, _)[_plugins__])
+],
+[_MYSQL_CHECK_PLUGIN_META([$1], [__mysql_]m4_bpatsubst($1, -, _)[_plugins__])
+_MYSQL_MODULE_META_CHECK(m4_shift($@))])
 ])
 
 AC_DEFUN([_MYSQL_CHECK_PLUGIN_META], [
-  [$1] ) dnl
+  [$1] )
 m4_ifdef([$2], [
-    mysql_modules='m4_bpatsubst($2, :, [ ])' dnl
+    mysql_modules='m4_bpatsubst($2, :, [ ])'
 ],[
-    mysql_modules='' dnl
+    mysql_modules=''
 ])
-    ;; dnl
+    ;;
 ])
 
 
 dnl ---------------------------------------------------------------------------
 
 
-AC_DEFUN([_MYSQL_PLUGAPPEND],[ dnl
- m4_ifdef([$1],[ dnl
-  m4_define([__plugin_append_tmp__], m4_defn([$1])) dnl
-  m4_undefine([$1]) dnl
-  m4_define([$1], __plugin_append_tmp__[:$2]) dnl
-  m4_undefine([__plugin_append_tmp__]) dnl
- ],[ dnl
-  m4_define([$1], [$2]) dnl
-  $3 dnl
- ]) dnl
+AC_DEFUN([_MYSQL_PLUGAPPEND],[
+ m4_ifdef([$1],[
+  m4_define([__plugin_append_tmp__], m4_defn([$1]))
+  m4_undefine([$1])
+  m4_define([$1], __plugin_append_tmp__[:$2])
+  m4_undefine([__plugin_append_tmp__])
+ ],[
+  m4_define([$1], [$2])
+  $3
+ ])
 ])
 
-AC_DEFUN([_MYSQL_PLUGAPPEND_OPTS],[ dnl
- ifelse($#, 0, [], $#, 1, [ dnl
+AC_DEFUN([_MYSQL_PLUGAPPEND_OPTS],[
+ ifelse($#, 0, [], $#, 1, [
   AC_FATAL([[bad number of args]])
- ], $#, 2, [ dnl
-  _MYSQL_PLUGAPPEND_OPTONE([$1],[$2]) dnl
- ],[ dnl
-  _MYSQL_PLUGAPPEND_OPTONE([$1],[$2]) dnl
+ ], $#, 2, [
+  _MYSQL_PLUGAPPEND_OPTONE([$1],[$2])
+ ],[
+  _MYSQL_PLUGAPPEND_OPTONE([$1],[$2])
   _MYSQL_PLUGAPPEND_OPTS([$1], m4_shift(m4_shift($@)))
  ])
 ])
 
-AC_DEFUN([_MYSQL_PLUGAPPEND_OPTONE],[ dnl
- ifelse([$2], [all], [ dnl
-  AC_FATAL([[protected plugin group: all]]) dnl
- ],[ dnl
-  ifelse([$2], [none], [ dnl
-   AC_FATAL([[protected plugin group: none]]) dnl
-  ],[ dnl
-   _MYSQL_PLUGAPPEND([__mysql_$1_configs__],[$2]) dnl
-   _MYSQL_PLUGAPPEND([__mysql_]m4_bpatsubst($2, -, _)[_plugins__],[$1], [ dnl
-    _MYSQL_PLUGAPPEND([__mysql_metaplugin_list__],[$2]) dnl
-   ]) dnl
-  ]) dnl
- ]) dnl
+AC_DEFUN([_MYSQL_PLUGAPPEND_OPTONE],[
+ ifelse([$2], [all], [
+  AC_FATAL([[protected plugin group: all]])
+ ],[
+  ifelse([$2], [none], [
+   AC_FATAL([[protected plugin group: none]])
+  ],[
+   _MYSQL_PLUGAPPEND([__mysql_$1_configs__],[$2])
+   _MYSQL_PLUGAPPEND([__mysql_]m4_bpatsubst($2, -, _)[_plugins__],[$1], [
+    _MYSQL_PLUGAPPEND([__mysql_metaplugin_list__],[$2])
+   ])
+  ])
+ ])
 ])
 
 
 dnl ---------------------------------------------------------------------------
 
 
-AC_DEFUN([MYSQL_LIST_PLUGINS],[ dnl
- m4_ifdef([__mysql_plugin_list__],[ dnl
-  _MYSQL_LIST_PLUGINS(m4_bpatsubst(__mysql_plugin_list__, :, [,])) dnl
- ]) dnl
+AC_DEFUN([MYSQL_LIST_PLUGINS],[dnl
+ m4_ifdef([__mysql_plugin_list__],[dnl
+  _MYSQL_LIST_PLUGINS(m4_bpatsubst(__mysql_plugin_list__, :, [,]))dnl
+ ])dnl
 ])
 
-AC_DEFUN([_MYSQL_LIST_PLUGINS],[ dnl
- ifelse($#, 0, [], $#, 1, [ dnl
-  MYSQL_SHOW_PLUGIN([$1]) dnl
- ],[ dnl
-  MYSQL_SHOW_PLUGIN([$1]) dnl
-  _MYSQL_LIST_PLUGINS(m4_shift($@)) dnl
- ]) dnl
+AC_DEFUN([_MYSQL_LIST_PLUGINS],[dnl
+ ifelse($#, 0, [], $#, 1, [dnl
+  MYSQL_SHOW_PLUGIN([$1])dnl
+ ],[dnl
+  MYSQL_SHOW_PLUGIN([$1])dnl
+  _MYSQL_LIST_PLUGINS(m4_shift($@))dnl
+ ])dnl
 ])
 
-AC_DEFUN([MYSQL_SHOW_PLUGIN],[ dnl
+AC_DEFUN([MYSQL_SHOW_PLUGIN],[
  _MYSQL_SHOW_PLUGIN(
   [$1],
   [$1-plugin],
@@ -508,19 +515,20 @@ AC_DEFUN([MYSQL_SHOW_PLUGIN],[ dnl
  )
 ])
 
-AC_DEFUN([_MYSQL_SHOW_PLUGIN],[
-  === Plug-in: $3 ===
+AC_DEFUN([_MYSQL_SHOW_PLUGIN],[dnl
+  === Plugin: $3 ===
   Module Name:      [$1]
   Description:      $4
-  Supports build:   _PLUGIN_BUILD_TYPE([$7],[$8]) dnl
+  Supports build:   _PLUGIN_BUILD_TYPE([$7],[$8])[]dnl
 m4_ifdef([$12],[
-  Configurations:   m4_bpatsubst($12, :, [, ])]) dnl
+  Configurations:   m4_bpatsubst($12, :, [, ])])[]dnl
 m4_ifdef([$10],[
-  Status:           disabled], [ dnl
+  Status:           disabled])[]dnl
 m4_ifdef([$9],[
-  Status:           mandatory])])])
+  Status:           mandatory])[]dnl
+])
 
-AC_DEFUN([_PLUGIN_BUILD_TYPE], dnl
+AC_DEFUN([_PLUGIN_BUILD_TYPE],
 [m4_ifdef([$1],[ifelse($1,[no],[],[static ]m4_ifdef([$2],[and dnl
 ]))])[]m4_ifdef([$2],[dynamic],[m4_ifdef([$1],[],[static])])])
 
@@ -528,108 +536,107 @@ AC_DEFUN([_PLUGIN_BUILD_TYPE], dnl
 dnl ---------------------------------------------------------------------------
 
 
-AC_DEFUN([_MYSQL_MODULE_ARGS_CHECK],[ dnl
- ifelse($#, 0, [], $#, 1, [ dnl
+AC_DEFUN([_MYSQL_MODULE_ARGS_CHECK],[
+ ifelse($#, 0, [], $#, 1, [
   _MYSQL_CHECK_PLUGIN_ARG([$1],
    [MYSQL_MODULE_DISABLED_]AS_TR_CPP([$1]),
-   [MYSQL_MODULE_ACTIONS_]AS_TR_CPP([$1])) dnl
- ],[ dnl
+   [MYSQL_MODULE_ACTIONS_]AS_TR_CPP([$1]))
+ ],[
   _MYSQL_CHECK_PLUGIN_ARG([$1],
    [MYSQL_MODULE_DISABLED_]AS_TR_CPP([$1]),
-   [MYSQL_MODULE_ACTIONS_]AS_TR_CPP([$1])) dnl
-  _MYSQL_MODULE_ARGS_CHECK(m4_shift($@)) dnl
- ]) dnl
+   [MYSQL_MODULE_ACTIONS_]AS_TR_CPP([$1]))
+  _MYSQL_MODULE_ARGS_CHECK(m4_shift($@))
+ ])
 ])
 
-AC_DEFUN([_MYSQL_CHECK_PLUGIN_ARG],[ dnl
+AC_DEFUN([_MYSQL_CHECK_PLUGIN_ARG],[
  m4_ifdef([$3], [], [m4_define([$3],[ ])])
-    [$1] ) dnl
+    [$1] )
  m4_ifdef([$2],[
-      AC_MSG_ERROR([plugin $1 is disabled]) dnl
+      AC_MSG_ERROR([plugin $1 is disabled])
  ],[
-      [mysql_module_]m4_bpatsubst([$1], -, _)=yes dnl
+      [mysql_module_]m4_bpatsubst([$1], -, _)=yes
  ])
-      ;; dnl
+      ;;
 ])
 
-AC_DEFUN([_MYSQL_SANE_VARS], [ dnl
- ifelse($#, 0, [], $#, 1, [ dnl
-  _MYSQL_SANEVAR([$1]) dnl
- ],[ dnl
-  _MYSQL_SANEVAR([$1]) dnl
-  _MYSQL_SANE_VARS(m4_shift($@)) dnl
- ]) dnl
+AC_DEFUN([_MYSQL_SANE_VARS], [
+ ifelse($#, 0, [], $#, 1, [
+  _MYSQL_SANEVAR([$1])
+ ],[
+  _MYSQL_SANEVAR([$1])
+  _MYSQL_SANE_VARS(m4_shift($@))
+ ])
 ])
 
 AC_DEFUN([_MYSQL_SANEVAR], [
-   test -z "[$mysql_module_]m4_bpatsubst([$1], -, _)" && dnl
+   test -z "[$mysql_module_]m4_bpatsubst([$1], -, _)" &&
 [mysql_module_]m4_bpatsubst([$1], -, _)='.'
-   test -z "[$with_module_]m4_bpatsubst([$1], -, _)" && dnl
-[with_module_]m4_bpatsubst([$1], -, _)='.' dnl
+   test -z "[$with_module_]m4_bpatsubst([$1], -, _)" &&
+[with_module_]m4_bpatsubst([$1], -, _)='.'
 ])
 
-AC_DEFUN([_MYSQL_CHECK_DEPENDENCIES], [ dnl
- ifelse($#, 0, [], $#, 1, [ dnl
-  _MYSQL_CHECK_DEPENDS([$1],[__mysql_plugdepends_$1__]) dnl
- ],[ dnl
-  _MYSQL_CHECK_DEPENDS([$1],[__mysql_plugdepends_$1__]) dnl
-  _MYSQL_CHECK_DEPENDENCIES(m4_shift($@)) dnl
- ]) dnl
+AC_DEFUN([_MYSQL_CHECK_DEPENDENCIES], [
+ ifelse($#, 0, [], $#, 1, [
+  _MYSQL_CHECK_DEPENDS([$1],[__mysql_plugdepends_$1__])
+ ],[
+  _MYSQL_CHECK_DEPENDS([$1],[__mysql_plugdepends_$1__])
+  _MYSQL_CHECK_DEPENDENCIES(m4_shift($@))
+ ])
 ])
 
-AC_DEFUN([_MYSQL_CHECK_DEPENDS], [ dnl
+AC_DEFUN([_MYSQL_CHECK_DEPENDS], [
  m4_ifdef([$2], [
    if test "[$mysql_module_]m4_bpatsubst([$1], -, _)" = yes -a \
            "[$with_module_]m4_bpatsubst([$1], -, _)" != no -o \
-           "[$with_module_]m4_bpatsubst([$1], -, _)" = yes; then dnl
+           "[$with_module_]m4_bpatsubst([$1], -, _)" = yes; then
      _MYSQL_GEN_DEPENDS(m4_bpatsubst($2, :, [,]))
-   fi dnl
- ]) dnl
+   fi
+ ])
 ])
 
-AC_DEFUN([_MYSQL_GEN_DEPENDS], [ dnl
- ifelse($#, 0, [], $#, 1, [ dnl
-  _MYSQL_GEN_DEPEND([$1]) dnl
- ],[ dnl
-  _MYSQL_GEN_DEPEND([$1]) dnl
-  _MYSQL_GEN_DEPENDS(m4_shift($@)) dnl
- ]) dnl
+AC_DEFUN([_MYSQL_GEN_DEPENDS], [
+ ifelse($#, 0, [], $#, 1, [
+  _MYSQL_GEN_DEPEND([$1])
+ ],[
+  _MYSQL_GEN_DEPEND([$1])
+  _MYSQL_GEN_DEPENDS(m4_shift($@))
+ ])
 ])
 
-AC_DEFUN([_MYSQL_GEN_DEPEND], [ dnl
+AC_DEFUN([_MYSQL_GEN_DEPEND], [
  m4_ifdef([MYSQL_MODULE_DISABLED_]AS_TR_CPP([$1]),[
-      AC_MSG_ERROR([depends upon disabled module $1]) dnl
+      AC_MSG_ERROR([depends upon disabled module $1])
  ],[
       [mysql_module_]m4_bpatsubst([$1], -, _)=yes
       if test "[$with_module_]m4_bpatsubst([$1], -, _)" = no; then
         AC_MSG_ERROR([depends upon disabled module $1])
-      fi dnl
- ]) dnl
+      fi
+ ])
 ])
 
 AC_DEFUN([_MYSQL_CHECK_PLUGIN_ARGS],[
- AC_ARG_WITH([modules], [
-   --with-modules=PLUGIN[[,PLUGIN..]]
-m4_text_wrap([Plugin modules to include in mysqld. (default is: $1)
-Must be configuration name or a comma seperated list of modules.],
-[                          ])
-m4_text_wrap([Available configurations are: ]
-m4_bpatsubst(m4_ifdef([__mysql_metaplugin_list__], dnl
-none:all:__mysql_metaplugin_list__,none:all), :, [ ])[.],
-[                          ])
-m4_text_wrap([Available plugin modules are: ] dnl
-m4_bpatsubst(__mysql_plugin_list__, :, [ ])[.], [                          ])
-  --without-module-PLUGIN
-m4_text_wrap([Disable the named module from being built. Otherwise, 
-for modules which are not selected for inclusion in mysqld will be 
-built dynamically (if supported)],[                          ])
-],[mysql_modules="`echo $withval | tr ',.:;*[]' '       '`"], 
-  [mysql_modules=['$1']])
+ AC_ARG_WITH([modules],
+AS_HELP_STRING([--with-modules=PLUGIN[[[[[,PLUGIN..]]]]]],
+ [Plugin modules to include in mysqld. (default is: $1) Must be a
+ configuration name or a comma separated list of modules.])
+AS_HELP_STRING([],[Available configurations are:] dnl
+m4_bpatsubst([none:all]m4_ifdef([__mysql_metaplugin_list__],
+__mysql_metaplugin_list__), :, [ ])[.])
+AS_HELP_STRING([],[Available plugin modules are:] dnl
+m4_bpatsubst(__mysql_plugin_list__, :, [ ])[.])
+AS_HELP_STRING([--without-module-PLUGIN],
+                [Disable the named module from being built. Otherwise, for
+                modules which are not selected for inclusion in mysqld will be
+                built dynamically (if supported)])
+AS_HELP_STRING([--with-module-PLUGIN],
+               [Forces the named module to be linked into mysqld statically.]),
+ [mysql_modules="`echo $withval | tr ',.:;*[]' '       '`"],
+ [mysql_modules=['$1']])
 
 m4_divert_once([HELP_VAR_END],[
 Description of plugin modules:
-m4_indir([MYSQL_LIST_PLUGINS])
-])
+MYSQL_LIST_PLUGINS])
 
   case "$mysql_modules" in
   all )
@@ -637,20 +644,17 @@ m4_indir([MYSQL_LIST_PLUGINS])
     ;;
   none )
     mysql_modules=''
-    ;; dnl
-m4_ifdef([__mysql_metaplugin_list__],[ dnl
-_MYSQL_MODULE_META_CHECK(m4_bpatsubst(__mysql_metaplugin_list__, :, [,])) dnl
+    ;;
+m4_ifdef([__mysql_metaplugin_list__],[
+_MYSQL_MODULE_META_CHECK(m4_bpatsubst(__mysql_metaplugin_list__, :, [,]))
 ])
   esac
 
   for plugin in $mysql_modules; do
     case "$plugin" in
-    all )
+    all | none )
       AC_MSG_ERROR([bad module name: $plugin])
       ;;
-    none )
-      AC_MSG_ERROR([bad module name: $plugin])
-      ;; dnl
 _MYSQL_MODULE_ARGS_CHECK(m4_bpatsubst(__mysql_plugin_list__, :, [,]))
     * )
       AC_MSG_ERROR([unknown plugin module: $plugin])
@@ -675,6 +679,11 @@ AC_DEFUN([_MYSQL_POST_PLUGIN_FIXUP],[
       AC_MSG_ERROR([don't know how to handle plugin dir $plugdir])      
       ;;    
     esac
+    if test -f "$srcdir/$plugdir/configure" ; then
+      other_configures="$other_configures $plugdir/configure"
+    else
+      ac_config_files="$ac_config_files $plugdir/Makefile"
+    fi
   done
   AC_SUBST(mysql_se_dirs)
   AC_SUBST(mysql_pg_dirs)