bk commit into 5.1 tree (holyfoot:1.2328)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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@stripped, 2006-10-19 16:39:24+05:00, holyfoot@stripped +2 -0
  libmysqld/Makefile.am  fixed

  config/ac-macros/plugins.m4@stripped, 2006-10-19 16:39:20+05:00, holyfoot@stripped +5 -5
    code moved to the proper place

  libmysqld/Makefile.am@stripped, 2006-10-19 16:39:20+05:00, holyfoot@stripped +3 -3
    "" removed

# 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:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-5.1-relcnk

--- 1.19/config/ac-macros/plugins.m4	2006-10-19 16:39:32 +05:00
+++ 1.20/config/ac-macros/plugins.m4	2006-10-19 16:39:32 +05:00
@@ -373,11 +373,6 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
        ])
        AC_SUBST([plugin_]$2[_shared_target], "$8")
        AC_SUBST([plugin_]$2[_static_target], [""])
-       m4_ifdef([$11],[
-        condition_dependent_plugin_modules="$condition_dependent_plugin_modules
m4_bregexp($11, [[^/]+$], [\&])"
-        condition_dependent_plugin_links="$condition_dependent_plugin_links $6/$11"
-        condition_dependent_plugin_includes="$condition_dependent_plugin_includes
-I[\$(top_srcdir)]/$6/m4_bregexp($11, [^.+[/$]], [\&])"
-       ])
        [with_plugin_]$2=yes
        AC_MSG_RESULT([plugin])
        m4_ifdef([$6],[
@@ -434,6 +429,11 @@ dnl Although this is "pretty", it breaks
       mysql_plugin_defs="$mysql_plugin_defs, [builtin_]$2[_plugin]"
       [with_plugin_]$2=yes
       AC_MSG_RESULT([yes])
+      m4_ifdef([$11],[
+       condition_dependent_plugin_modules="$condition_dependent_plugin_modules
m4_bregexp($11, [[^/]+$], [\&])"
+       condition_dependent_plugin_links="$condition_dependent_plugin_links $6/$11"
+       condition_dependent_plugin_includes="$condition_dependent_plugin_includes
-I[\$(top_srcdir)]/$6/m4_bregexp($11, [^.+[/$]], [\&])"
+      ])
     fi
     m4_ifdef([$6],[
       if test -n "$mysql_use_plugin_dir" ; then

--- 1.100/libmysqld/Makefile.am	2006-10-19 16:39:32 +05:00
+++ 1.101/libmysqld/Makefile.am	2006-10-19 16:39:32 +05:00
@@ -158,11 +158,11 @@ endif
 # This is called from the toplevel makefile
 link_sources:
 	  set -x; \
-	  for f in "$(sqlsources)"; do \
+	  for f in $(sqlsources); do \
 	    rm -f $$f; \
 	    @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
 	  done; \
-	  for f in "$(libmysqlsources)"; do \
+	  for f in $(libmysqlsources); do \
 	    rm -f $$f; \
 	    @LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \
 	  done; \
@@ -176,7 +176,7 @@ link_sources:
 	  if test -n "$(storagesources)" ; \
 	  then \
 	    rm -f $(storagesources); \
-	    for f in "$(storagesourceslinks)"; do \
+	    for f in $(storagesourceslinks); do \
 	      @LN_CP_F@ $(top_srcdir)/$$f . ; \
 	    done; \
 	  fi; \