List:Commits« Previous MessageNext Message »
From:Sergei Golubchik Date:May 4 2006 8:16pm
Subject:bk commit into 5.1 tree (serg:1.2394)
View as plain text  
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.2394 06/05/04 14:15:37 serg@stripped +1 -0
  cleanup - don't test in configure what belongs to m4

  config/ac-macros/plugins.m4
    1.11 06/05/04 14:15:30 serg@stripped +5 -5
    cleanup - don't test in configure what belongs to m4

# 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.10/config/ac-macros/plugins.m4	Wed May  3 12:59:01 2006
+++ 1.11/config/ac-macros/plugins.m4	Thu May  4 14:15:30 2006
@@ -397,11 +397,11 @@
     m4_ifdef([$6],[
       if test -n "$mysql_use_plugin_dir" ; then
         mysql_plugin_dirs="$mysql_plugin_dirs $6"
-        if test -f "$srcdir/$6/configure" ; then
-          other_configures="$other_configures $6/configure"
-        else
-          AC_CONFIG_FILES($6/Makefile)
-        fi
+        m4_syscmd(test -f "$6/configure")
+        ifelse(m4_sysval, 0,
+          [other_configures="$other_configures $6/configure"],
+          [AC_CONFIG_FILES($6/Makefile)]
+        )
         ifelse(m4_substr($6, 0, 8), [storage/],
           [mysql_se_dirs="$mysql_se_dirs ]m4_substr($6, 8)",
           m4_substr($6, 0, 7), [plugin/],
Thread
bk commit into 5.1 tree (serg:1.2394)Sergei Golubchik4 May