[SCM] GNU Autoconf source repository branch, master, updated. v2.63-137-g4298bf0

[Paolo Bonzini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=4298bf09e470242b2ef50a514e1d729d494766c9

The branch, master has been updated
       via  4298bf09e470242b2ef50a514e1d729d494766c9 (commit)
       via  c29ca1d13b98eb1791ba5b7365327c91ccca6c13 (commit)
       via  3fb0b9566748e8ade6fc22e3e7b9ab71fdfcc5c1 (commit)
      from  d2dabc34ef06bbee1c92c0b38f155478c918a0da (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4298bf09e470242b2ef50a514e1d729d494766c9
Author: Paolo Bonzini <address@hidden>
Date:   Thu Oct 30 10:23:40 2008 +0100

    trim down the length of the shell function test
    
    * lib/m4sugar/m4sh.m4 (_AS_SHELL_FN_WORK): Condense.

commit c29ca1d13b98eb1791ba5b7365327c91ccca6c13
Author: Paolo Bonzini <address@hidden>
Date:   Thu Oct 30 09:52:22 2008 +0100

    Avoid walking the entire PATH when looking for a better shell.
    
    * lib/m4sugar/m4sh.m4 (_AS_SHELL_SANITIZE): Test shell characteristics
    as the PATH is walked.

commit 3fb0b9566748e8ade6fc22e3e7b9ab71fdfcc5c1
Author: Paolo Bonzini <address@hidden>
Date:   Thu Oct 30 09:51:32 2008 +0100

    Add third argument to _AS_PATH_WALK
    
    * lib/m4sugar/m4sh.m4 (_AS_SHELL_SANITIZE): Do not call _AS_CR_PREPARE.
    (_AS_PATH_WALK): Add third optional argument.

-----------------------------------------------------------------------

Summary of changes:
 lib/m4sugar/m4sh.m4 |   85 ++++++++++++++++++--------------------------------
 1 files changed, 31 insertions(+), 54 deletions(-)

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 22e7e3e..e097e1e 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -221,24 +221,23 @@ dnl Remove any tests from suggested that are also required
        [as_have_required=no])
   AS_IF([test x$as_have_required = xyes && _AS_RUN(["$as_suggested"])],
     [],
-    [as_candidate_shells=
-    _AS_PATH_WALK([/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH],
+    [_AS_PATH_WALK([/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH],
       [case $as_dir in @%:@(
         /*)
           for as_base in sh bash ksh sh5; do
-            as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+            # Try only shells that exist, to save several forks.
+            as_shell=$as_dir/$as_base
+            AS_IF([{ test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+                   _AS_RUN(["$as_required"], ["$as_shell"])],
+                  [CONFIG_SHELL=$as_shell as_have_required=yes
+                  m4_set_empty([_AS_DETECT_SUGGESTED_BODY], [break 2],
+                    [AS_IF([_AS_RUN(["$as_suggested"], ["$as_shell"])],
+                           [break 2])])])
           done;;
-       esac])
-
-      for as_shell in $as_candidate_shells $SHELL; do
-        # Try only shells that exist, to save several forks.
-        AS_IF([{ test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-               _AS_RUN(["$as_required"], ["$as_shell"])],
-              [CONFIG_SHELL=$as_shell
-              as_have_required=yes
-              m4_set_empty([_AS_DETECT_SUGGESTED_BODY], [break],
-                [AS_IF([_AS_RUN(["$as_suggested"], ["$as_shell"])], 
[break])])])
-      done
+       esac],
+      [AS_IF([{ test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+             _AS_RUN(["$as_required"], ["$SHELL"])],
+            [CONFIG_SHELL=$SHELL as_have_required=yes])])
 
       AS_IF([test "x$CONFIG_SHELL" != x],
        [# We cannot yet assume a decent shell, so we have to provide a
@@ -388,43 +387,19 @@ m4_define([_AS_RUN],
 # This is a spy to detect "in the wild" shells that do not support shell
 # functions correctly.  It is based on the m4sh.at Autotest testcases.
 m4_define([_AS_SHELL_FN_WORK],
-[as_func_return ()
-{
-  (exit [$]1)
-}
-as_func_success ()
-{
-  as_func_return 0
-}
-as_func_failure ()
-{
-  as_func_return 1
-}
-as_func_ret_success ()
-{
-  return 0
-}
-as_func_ret_failure ()
-{
-  return 1
-}
+[as_func_return () { (exit [$]1); }
+as_func_success () { as_func_return 0; }
+as_func_failure () { as_func_return 1; }
+as_func_ret_success () { return 0; }
+as_func_ret_failure () { return 1; }
 
 exitcode=0
-AS_IF([as_func_success], [],
-  [exitcode=1
-  echo as_func_success failed.])
-AS_IF([as_func_failure],
-  [exitcode=1
-  echo as_func_failure succeeded.])
-AS_IF([as_func_ret_success], [],
-  [exitcode=1
-  echo as_func_ret_success failed.])
-AS_IF([as_func_ret_failure],
-  [exitcode=1
-  echo as_func_ret_failure succeeded.])
+as_func_success || { exitcode=1; echo as_func_success failed.; }
+as_func_failure && { exitcode=1; echo as_func_failure succeeded.; }
+as_func_ret_success || { exitcode=1; echo as_func_ret_success failed.; }
+as_func_ret_failure && { exitcode=1; echo as_func_ret_failure succeeded.; }
 AS_IF([( set x; as_func_ret_success y && test x = "[$]1" )], [],
-  [exitcode=1
-  echo positional parameters were not saved.])
+      [exitcode=1; echo positional parameters were not saved.])
 test x$exitcode = x0[]])# _AS_SHELL_FN_WORK
 
 
@@ -435,9 +410,6 @@ m4_defun([_AS_SHELL_SANITIZE],
 [m4_text_box([M4sh Initialization.])
 
 AS_BOURNE_COMPATIBLE
-
-# PATH needs CR
-_AS_CR_PREPARE
 _AS_ECHO_PREPARE
 _AS_PATH_SEPARATOR_PREPARE
 
@@ -1154,9 +1126,10 @@ fi
 ])# _AS_PATH_SEPARATOR_PREPARE
 
 
-# _AS_PATH_WALK([PATH = $PATH], BODY)
-# -----------------------------------
-# Walk through PATH running BODY for each `as_dir'.
+# _AS_PATH_WALK([PATH = $PATH], BODY, [IF-NOT-FOUND])
+# ---------------------------------------------------
+# Walk through PATH running BODY for each `as_dir'.  If BODY never does a
+# `break', evaluate IF-NOT-FOUND.
 #
 # Still very private as its interface looks quite bad.
 #
@@ -1168,6 +1141,7 @@ fi
 m4_defun_init([_AS_PATH_WALK],
 [AS_REQUIRE([_AS_PATH_SEPARATOR_PREPARE])],
 [as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+m4_ifvaln([$3], [as_found=false])dnl
 m4_bmatch([$1], [[:;]],
 [as_dummy="$1"
 for as_dir in $as_dummy],
@@ -1175,8 +1149,11 @@ for as_dir in $as_dummy],
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
+  m4_ifvaln([$3], [as_found=:])dnl
   $2
+  m4_ifvaln([$3], [as_found=false])dnl
 done
+m4_ifvaln([$3], [$as_found || { $3; }])dnl
 IFS=$as_save_IFS
 ])
 


hooks/post-receive
--
GNU Autoconf source repository