bzr commit into mysql-6.0 branch (joerg:2666) Bug#37425

[Joerg Bruehe]

#At file:///MySQL/REPO/V60/push-6.0/

 2666 Joerg Bruehe	2008-06-16
      File "config/ac-macros/libevent_configure.m4" was missing in the source tarball
      (bug#37425).
      
      Fix that in top-level "Makefile.am",
      also improve comments about this file in "config/ac-macros/libevent.m4"
modified:
  Makefile.am
  config/ac-macros/libevent.m4

per-file messages:
  Makefile.am
    Use the "EXTRA_DIST" mechanism for "config/ac-macros/libevent_configure.m4"
    so that it gets into the source tarball (bug#37425),
    but is evaluated only if "--with-libevent" is given.
  config/ac-macros/libevent.m4
    Improve comment about file inclusion.
=== modified file 'Makefile.am'
--- a/Makefile.am	2008-05-21 10:17:29 +0000
+++ b/Makefile.am	2008-06-16 19:27:44 +0000
@@ -17,9 +17,14 @@
 
 AUTOMAKE_OPTIONS =	foreign
 
-# These are built from source in the Docs directory
+# Files in the first two lines are built from source in the Docs directory,
+# "CMakeLists.txt" is for Windows only,
+# "libevent_configure.m4" is needed in sources but should be evaluated only
+#    if "--with-libevent" is given (handled in "config/ac-macros/libevent.m4").
 EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN-SOURCE \
-			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
+			README COPYING EXCEPTIONS-CLIENT \
+			CMakeLists.txt \
+			config/ac-macros/libevent_configure.m4
 
 SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \
 			@readline_topdir@ sql-common scripts \

=== modified file 'config/ac-macros/libevent.m4'
--- a/config/ac-macros/libevent.m4	2008-04-28 23:56:34 +0000
+++ b/config/ac-macros/libevent.m4	2008-06-16 19:27:44 +0000
@@ -22,7 +22,8 @@ AC_DEFUN([MYSQL_USE_BUNDLED_LIBEVENT], [
   AC_DEFINE([HAVE_LIBEVENT], [1], [If we want to use libevent and have connection pooling])
   AC_MSG_RESULT([using bundled libevent])
 
-  dnl Use builtin include to workaround path problems on older versions of aclocal.
+  dnl Get the upstream file with the original libevent configure macros.
+  dnl Use builtin include for this, to work around path problems in old versions of aclocal.
   builtin([include],[config/ac-macros/libevent_configure.m4])
 ])