bzr commit into mysql-6.0-bugteam branch (joro:3119) Bug#43614

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/work/mysql-6.0-merge/ based on revid:sergey.glukhov@stripped

 3119 Georgi Kodinov	2009-03-13 [merge]
      merged bug #43614 to 6.0

    modified:
      config/ac-macros/ha_ndbcluster.m4
      config/ac-macros/plugins.m4
      storage/falcon/plug.in
      storage/maria/plug.in
=== modified file 'config/ac-macros/ha_ndbcluster.m4'
--- a/config/ac-macros/ha_ndbcluster.m4	2009-01-09 11:46:26 +0000
+++ b/config/ac-macros/ha_ndbcluster.m4	2009-03-13 13:18:32 +0000
@@ -347,42 +347,11 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
   AC_SUBST([NDB_SIZEOF_LONG])
   AC_SUBST([NDB_SIZEOF_LONG_LONG])
 
-  AC_CONFIG_FILES(storage/ndb/include/Makefile dnl
-   storage/ndb/src/Makefile storage/ndb/src/common/Makefile dnl
-   storage/ndb/docs/Makefile dnl
-   storage/ndb/tools/Makefile dnl
-   storage/ndb/src/common/debugger/Makefile dnl
-   storage/ndb/src/common/debugger/signaldata/Makefile dnl
-   storage/ndb/src/common/portlib/Makefile dnl
-   storage/ndb/src/common/util/Makefile dnl
-   storage/ndb/src/common/logger/Makefile dnl
-   storage/ndb/src/common/transporter/Makefile dnl
-   storage/ndb/src/common/mgmcommon/Makefile dnl
-   storage/ndb/src/kernel/Makefile dnl
-   storage/ndb/src/kernel/error/Makefile dnl
-   storage/ndb/src/kernel/blocks/Makefile dnl
-   storage/ndb/src/kernel/blocks/dbdict/Makefile dnl
-   storage/ndb/src/kernel/blocks/dbdih/Makefile dnl
-   storage/ndb/src/kernel/blocks/dblqh/Makefile dnl
-   storage/ndb/src/kernel/blocks/dbtup/Makefile dnl
-   storage/ndb/src/kernel/blocks/backup/Makefile dnl
-   storage/ndb/src/kernel/vm/Makefile dnl
-   storage/ndb/src/mgmapi/Makefile dnl
-   storage/ndb/src/ndbapi/Makefile dnl
-   storage/ndb/src/mgmsrv/Makefile dnl
-   storage/ndb/src/mgmclient/Makefile dnl
-   storage/ndb/src/cw/Makefile dnl
-   storage/ndb/src/cw/cpcd/Makefile dnl
-   storage/ndb/test/Makefile dnl
-   storage/ndb/test/src/Makefile dnl
-   storage/ndb/test/ndbapi/Makefile dnl
-   storage/ndb/test/ndbapi/bank/Makefile dnl
-   storage/ndb/test/tools/Makefile dnl
-   storage/ndb/test/run-test/Makefile dnl
-   storage/ndb/include/ndb_version.h storage/ndb/include/ndb_global.h dnl
-   storage/ndb/include/ndb_types.h dnl
-   storage/ndb/swig/Makefile dnl
-  )
+  AC_CONFIG_FILES([
+   storage/ndb/include/ndb_version.h
+   storage/ndb/include/ndb_global.h
+   storage/ndb/include/ndb_types.h
+  ])
 ])
 
 AC_SUBST(TEST_NDBCLUSTER)                                                                                

=== modified file 'config/ac-macros/plugins.m4'
--- a/config/ac-macros/plugins.m4	2009-02-26 22:41:35 +0000
+++ b/config/ac-macros/plugins.m4	2009-03-13 13:18:32 +0000
@@ -477,10 +477,23 @@ dnl Although this is "pretty", it breaks
       # Even if we don't build a plugin, we bundle its source into the dist
       # file.  So its Makefile (and Makefiles for any subdirs) must be
       # generated for 'make dist' to work.
-      m4_syscmd(test -f "$6/configure")
+      m4_syscmd([test -f "]$6[/configure"])
       ifelse(m4_sysval, 0,
         [AC_CONFIG_SUBDIRS($6)],
-        [AC_CONFIG_FILES($6/Makefile)]
+        [
+          # autoconf doesn't provide an automatic way to configure DIST_SUBDIRS of
+          # a subdir; for our purposes, it's enough to just check for existing
+          # Makefile.am files and add them in here
+dnl
+dnl Warning, don't try to quote the m4_esyscmd() macro, it doesn't
+dnl work.  Quoting here is tricky.
+dnl
+dnl The $FIND or $SED variable can be set by the user when calling autoconf itself
+dnl to if they need to pass a specific path.  This is *NOT* used when calling
+dnl running configure!
+dnl
+          AC_CONFIG_FILES(m4_esyscmd([${FIND-find} "]$6[" -name Makefile.am -print | ${SED-sed} 's,\.am$,,']))
+        ]
       )
 
       ifelse(

=== modified file 'storage/falcon/plug.in'
--- a/storage/falcon/plug.in	2009-01-09 11:46:26 +0000
+++ b/storage/falcon/plug.in	2009-03-13 13:18:32 +0000
@@ -73,7 +73,6 @@ fi
 
 # Generate Makefile for TransformLib.
 MYSQL_PLUGIN_ACTIONS(falcon,[
-  AC_CONFIG_FILES(storage/falcon/TransformLib/Makefile)
 
   AC_LANG_PUSH([C++])
   ac_save_CXXFLAGS="$CXXFLAGS"

=== modified file 'storage/maria/plug.in'
--- a/storage/maria/plug.in	2009-01-09 11:46:26 +0000
+++ b/storage/maria/plug.in	2009-03-13 13:18:32 +0000
@@ -6,7 +6,6 @@ MYSQL_PLUGIN_STATIC(maria,     [libmaria
 MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(maria, [ha_maria.cc])
 
 MYSQL_PLUGIN_ACTIONS(maria,  [
-AC_CONFIG_FILES(storage/maria/unittest/Makefile)
 AC_ARG_WITH(maria-tmp-tables,
     AS_HELP_STRING([--with-maria-tmp-tables],[Use Maria for internal temporary tables]),
     [with_maria_tmp_tables=$withval],


Attachment: [text/bzr-bundle] bzr/[e-mail]