Revert the patch from 2006-04-01 and only improve

_AS_DETECT_BETTER_SHELL:

* lib/m4sugar/m4sh.m4 (_AS_PATH_WALK): Do not optimize; do not
skip nonexistent directories.
(_AS_DETECT_BETTER_SHELL): The optimization is moved here--try
only shell candidates which exist.
(AS_UNAME): No need to give three parameters to _AS_PATH_WALK.
* lib/autotest/general.m4 (AT_INIT): No need to give three
parameters to _AS_PATH_WALK.

diff --git a/ChangeLog b/ChangeLog
index b5acaa3f35afa05f28ef0fd1f50f23d4ad9012c9..88e2a70a5d3c2aeb03ef706184a2b27d9e81f1d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-04-07  Stepan Kasal  <kasal@ucw.cz>
+
+       Revert the patch from 2006-04-01 and only improve
+       _AS_DETECT_BETTER_SHELL:
+
+       * lib/m4sugar/m4sh.m4 (_AS_PATH_WALK): Do not optimize; do not
+       skip nonexistent directories.
+       (_AS_DETECT_BETTER_SHELL): The optimization is moved here--try
+       only shell candidates which exist.
+       (AS_UNAME): No need to give three parameters to _AS_PATH_WALK.
+       * lib/autotest/general.m4 (AT_INIT): No need to give three
+       parameters to _AS_PATH_WALK.
+
 2006-04-07  Stepan Kasal  <kasal@ucw.cz>,
            Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 9b915f298fa7b350e753976723799aa43ffd1f7f..798f04e8f78e520fd42906b5f8a90642f62aede8 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -558,7 +558,7 @@ case $as_dir in
       at_path=$at_path$at_top_srcdir/$as_dir
     fi
     ;;
-esac], [:])
+esac])
 
 # Now build and simplify PATH.
 #

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 83905949c6c31a3d016b5d4488998c0888f3d353..c6b01c9ed9e098e99ea0ed44e9f2f979f0ca6147 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -238,7 +238,9 @@ if test "x$CONFIG_SHELL" = x; then
        esac])
 
       for as_shell in $as_candidate_shells $SHELL; do
-        AS_IF([_AS_RUN([_AS_DETECT_REQUIRED_BODY],
+        # Try only shells which exist, to save several forks.
+        AS_IF([test -f $as_shell &&
+               _AS_RUN([_AS_DETECT_REQUIRED_BODY],
                         [($as_shell) 2> /dev/null])],
               [CONFIG_SHELL=$as_shell
               as_have_required=yes
@@ -937,10 +939,9 @@ fi
 ])# _AS_PATH_SEPARATOR_PREPARE
 
 
-# _AS_PATH_WALK([PATH = $PATH], BODY, [NO-OPTIMIZE])
-# --------------------------------------------------
-# Walk through PATH running BODY for each `as_dir'.  Skip nonexistent
-# directories unless NO-OPTIMIZE is specified.
+# _AS_PATH_WALK([PATH = $PATH], BODY)
+# -----------------------------------
+# Walk through PATH running BODY for each `as_dir'.
 #
 # Still very private as its interface looks quite bad.
 #
@@ -959,7 +960,6 @@ for as_dir in $as_dummy],
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  m4_ifvaln([$3], [], [test -d "$as_dir" || continue])dnl
   $2
 done
 IFS=$as_save_IFS
@@ -1156,7 +1156,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown`
 
 _ASUNAME
 
-_AS_PATH_WALK([$PATH], [echo "PATH: $as_dir"], [:])
+_AS_PATH_WALK([$PATH], [echo "PATH: $as_dir"])
 }])