bk commit into 5.1 tree (serg:1.2395)

[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.2395 06/05/04 17:14:56 serg@stripped +4 -0
  auto-include plug.in, remove the need for plugins to modify configure.in

  storage/example/plug.in
    1.1 06/05/04 17:14:49 serg@stripped +5 -0

  storage/archive/plug.in
    1.1 06/05/04 17:14:49 serg@stripped +5 -0

  storage/example/plug.in
    1.0 06/05/04 17:14:49 serg@stripped +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/storage/example/plug.in

  storage/archive/plug.in
    1.0 06/05/04 17:14:49 serg@stripped +0 -0
    BitKeeper file /usr/home/serg/Abk/mysql-5.1/storage/archive/plug.in

  configure.in
    1.347 06/05/04 17:14:43 serg@stripped +0 -12
    plug.in examples

  config/ac-macros/plugins.m4
    1.12 06/05/04 17:14:43 serg@stripped +21 -1
    auto-include plug.in, remove the need for plugins to modify configure.in

# 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:	sergbook.mysql.com
# Root:	/usr/home/serg/Abk/mysql-5.1

--- 1.346/configure.in	Tue May  2 07:10:54 2006
+++ 1.347/configure.in	Thu May  4 17:14:43 2006
@@ -52,12 +52,6 @@
 # Declare our plugin modules
 #--------------------------------------------------------------------
 
-MYSQL_STORAGE_ENGINE(archive,,  [Archive Storage Engine],
-        [Archive Storage Engine], [max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(archive, [storage/archive])
-MYSQL_PLUGIN_STATIC(archive,    [libarchive.a])
-MYSQL_PLUGIN_DYNAMIC(archive,   [ha_archive.la])
-
 MYSQL_STORAGE_ENGINE(berkeley,  berkeley-db, [BerkeleyDB Storage Engine],
         [Transactional Tables using BerkeleyDB], [max,max-no-ndb])
 MYSQL_PLUGIN_DIRECTORY(berkeley,[storage/bdb])
@@ -75,12 +69,6 @@
 MYSQL_PLUGIN_DIRECTORY(csv,     [storage/csv])
 MYSQL_PLUGIN_STATIC(csv,        [libcsv.a])
 MYSQL_PLUGIN_MANDATORY(csv)     dnl Used for logging
-
-MYSQL_STORAGE_ENGINE(example,,  [Example Storage Engine],
-        [Skeleton for Storage Engines for developers], [max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(example, [storage/example])
-MYSQL_PLUGIN_STATIC(example,    [libexample.a])
-MYSQL_PLUGIN_DYNAMIC(example,   [ha_example.la])
 
 MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine],
         [Connects to tables on remote MySQL servers], [max,max-no-ndb])

--- 1.11/config/ac-macros/plugins.m4	Thu May  4 14:15:30 2006
+++ 1.12/config/ac-macros/plugins.m4	Thu May  4 17:14:43 2006
@@ -249,7 +249,6 @@
  ])
 ])
 
-
 dnl ---------------------------------------------------------------------------
 dnl Macro: MYSQL_CONFIGURE_PLUGINS
 dnl
@@ -267,6 +266,10 @@
    AC_FATAL([cannot use [MYSQL_CONFIGURE_PLUGINS] multiple times])
  ],[
    m4_define([__mysql_plugin_configured__],[done])
+   _MYSQL_INCLUDE_LIST(
+   m4_bpatsubst(m4_esyscmd([ls plugin/*/plug.in storage/*/plug.in 2>/dev/null]),
+[[ 
+]],[,]))
    m4_ifdef([__mysql_plugin_list__],[
     _MYSQL_CHECK_PLUGIN_ARGS([$1])
     _MYSQL_CONFIGURE_PLUGINS(m4_bpatsubst(__mysql_plugin_list__, :, [,]))
@@ -728,6 +731,23 @@
   done
 
   _MYSQL_EMIT_PLUGIN_DEPENDS(m4_bpatsubst(__mysql_plugin_list__, :, [,]))
+])
+
+dnl ---------------------------------------------------------------------------
+dnl Macro: _MYSQL_INCLUDE_LIST
+dnl
+dnl SYNOPSIS
+dnl   _MYSQL_INCLUDE_LIST([filename,filename...])
+dnl
+dnl DESCRIPTION
+dnl   includes all files from the list
+dnl
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([_MYSQL_INCLUDE_LIST],[
+ ifelse([$1], [], [], [
+  sinclude($1)
+  _MYSQL_INCLUDE_LIST(m4_shift($@))
+ ])
 ])
 
 dnl ===========================================================================
--- New file ---
+++ storage/archive/plug.in	06/05/04 17:14:49
MYSQL_STORAGE_ENGINE(archive,,  [Archive Storage Engine],
        [Archive Storage Engine], [max,max-no-ndb])
MYSQL_PLUGIN_DIRECTORY(archive, [storage/archive])
MYSQL_PLUGIN_STATIC(archive,    [libarchive.a])
MYSQL_PLUGIN_DYNAMIC(archive,   [ha_archive.la])

--- New file ---
+++ storage/example/plug.in	06/05/04 17:14:49
MYSQL_STORAGE_ENGINE(example,,  [Example Storage Engine],
        [Skeleton for Storage Engines for developers], [max,max-no-ndb])
MYSQL_PLUGIN_DIRECTORY(example, [storage/example])
MYSQL_PLUGIN_STATIC(example,    [libexample.a])
MYSQL_PLUGIN_DYNAMIC(example,   [ha_example.la])