bk commit into 5.1 tree (serg:1.2396)

[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.2396 06/05/06 07:43:18 serg@stripped +3 -0
  auto-set MYSQL_PLUGIN_DIRECTORY for plug.in files

  storage/example/plug.in
    1.2 06/05/06 07:43:11 serg@stripped +0 -1
    MYSQL_PLUGIN_DIRECTORY for plug.in files is set automagically

  storage/archive/plug.in
    1.2 06/05/06 07:43:11 serg@stripped +0 -1
    MYSQL_PLUGIN_DIRECTORY for plug.in files is set automagically

  config/ac-macros/plugins.m4
    1.13 06/05/06 07:43:11 serg@stripped +6 -0
    auto-set MYSQL_PLUGIN_DIRECTORY for plug.in files

# 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.12/config/ac-macros/plugins.m4	Thu May  4 17:14:43 2006
+++ 1.13/config/ac-macros/plugins.m4	Sat May  6 07:43:11 2006
@@ -39,6 +39,10 @@
   m4_define([MYSQL_PLUGIN_NAME_]AS_TR_CPP([$1]), [$3])
   m4_define([MYSQL_PLUGIN_DESC_]AS_TR_CPP([$1]), [$4])
   _MYSQL_PLUGAPPEND_META([$1], $5)
+  ifelse(m4_bregexp(__mysql_include__,[/plug\.in$]),-1,[],[
+     MYSQL_PLUGIN_DIRECTORY([$1],
+         m4_bregexp(__mysql_include__,[^\(.*\)/plug\.in$],[\1]))
+  ])
  ])
 ])
 
@@ -745,7 +749,9 @@
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([_MYSQL_INCLUDE_LIST],[
  ifelse([$1], [], [], [
+  m4_define([__mysql_include__],[$1])
   sinclude($1)
+  m4_undefine([__mysql_include__])
   _MYSQL_INCLUDE_LIST(m4_shift($@))
  ])
 ])

--- 1.1/storage/archive/plug.in	Thu May  4 17:14:49 2006
+++ 1.2/storage/archive/plug.in	Sat May  6 07:43:11 2006
@@ -1,5 +1,4 @@
 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])

--- 1.1/storage/example/plug.in	Thu May  4 17:14:49 2006
+++ 1.2/storage/example/plug.in	Sat May  6 07:43:11 2006
@@ -1,5 +1,4 @@
 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])