Require _AS_CR_PREPARE where appropriate and fix ChangeLog.

* lib/m4sugar/m4sh.m4 (_AS_PREPARE): Call _AS_CR_PREPARE.
(AS_PREPARE): Require _AS_CR_PREPARE.

diff --git a/ChangeLog b/ChangeLog
index 5ee53929be8614707dfce0d23f64655f65fb4b3e..8d2cd25960e8b1ef11f683945b7708a7f366d9c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2008-10-30  Paolo Bonzini  <bonzini@gnu.org>
+
+       Require _AS_CR_PREPARE where appropriate.
+       * lib/m4sugar/m4sh.m4 (_AS_PREPARE): Call _AS_CR_PREPARE.
+       (AS_PREPARE): Require _AS_CR_PREPARE.
+
+       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.
+
+       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.
+
+       Trim down the length of the shell function test.
+       * lib/m4sugar/m4sh.m4 (_AS_SHELL_FN_WORK): Condense.
+
 2008-10-29  Eric Blake  <ebb9@byu.net>
 
        Fix LINENO detection to work around bash and pdksh limitations.

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index e097e1e6dd5c3027824ae05101f08cda8a2e9050..a67c30d5181ae41a742002fe854394240b6f94b6 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -295,6 +295,7 @@ _AS_EXPR_PREPARE
 _AS_BASENAME_PREPARE
 _AS_DIRNAME_PREPARE
 _AS_ME_PREPARE
+_AS_CR_PREPARE
 _AS_LINENO_PREPARE
 _AS_ECHO_N_PREPARE
 _AS_LN_S_PREPARE
@@ -316,6 +317,7 @@ AS_REQUIRE([_AS_EXPR_PREPARE])
 AS_REQUIRE([_AS_BASENAME_PREPARE])
 AS_REQUIRE([_AS_DIRNAME_PREPARE])
 AS_REQUIRE([_AS_ME_PREPARE])
+AS_REQUIRE([_AS_CR_PREPARE])
 AS_REQUIRE([_AS_LINENO_PREPARE])
 AS_REQUIRE([_AS_ECHO_N_PREPARE])
 AS_REQUIRE([_AS_LN_S_PREPARE])