bk commit into 5.1 tree (holyfoot:1.2313) BUG#23369

[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-17 23:19:47+05:00, holyfoot@stripped +2 -0
  bug #23369 (Embedded library can't be linked)
  Additional fix - we also need to set proper includes so these symlinked
  'storage' files can be compiled properly

  config/ac-macros/plugins.m4@stripped, 2006-10-17 23:19:41+05:00, holyfoot@stripped +2 -0
    includes for the storages added

  libmysqld/Makefile.am@stripped, 2006-10-17 23:19:42+05:00, holyfoot@stripped +2 -1
    includes for the storages added for the embedded compilation

# 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.eml

--- 1.18/config/ac-macros/plugins.m4	2006-10-17 23:20:06 +05:00
+++ 1.19/config/ac-macros/plugins.m4	2006-10-17 23:20:06 +05:00
@@ -306,6 +306,7 @@ AC_DEFUN([MYSQL_CONFIGURE_PLUGINS],[
     AC_SUBST([mysql_pg_unittest_dirs])
     AC_SUBST([condition_dependent_plugin_modules])
     AC_SUBST([condition_dependent_plugin_links])
+    AC_SUBST([condition_dependent_plugin_includes])
    ])
  ])
 ])
@@ -362,6 +363,7 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
    if test "X[$mysql_plugin_]$2" = Xyes; then
      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
   ])
   if test "X[$with_plugin_]$2" = Xno; then

--- 1.99/libmysqld/Makefile.am	2006-10-17 23:20:06 +05:00
+++ 1.100/libmysqld/Makefile.am	2006-10-17 23:20:06 +05:00
@@ -32,7 +32,8 @@ INCLUDES=		-I$(top_builddir)/include -I$
 			-I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples \
 			-I$(top_srcdir)/regex \
-			$(openssl_includes) @ZLIB_INCLUDES@
+			$(openssl_includes) @ZLIB_INCLUDES@ \
+			@condition_dependent_plugin_includes@
 
 noinst_LIBRARIES =	libmysqld_int.a
 pkglib_LIBRARIES =	libmysqld.a