Only prepare $as_me if it will be used.

* lib/m4sugar/m4sh.m4 (AS_SHELL_SANITIZE): Avoid unconditional
preparation.
(_AS_ECHO_LOG): Depend on $LINENO preparation.
(AS_MESSAGE): Depend on $as_me preparation.
(AS_TMPDIR): Use AS_ERROR, rather than a hand-rolled copy.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index e4176e8dd556867f9d5064b1690c2d6bf7d9ac69..258315b101711e4240de6926a63f6ae7e0a4514d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-09  Eric Blake  <ebb9@byu.net>
+
+       Only prepare $as_me if it will be used.
+       * lib/m4sugar/m4sh.m4 (AS_SHELL_SANITIZE): Avoid unconditional
+       preparation.
+       (_AS_ECHO_LOG): Depend on $LINENO preparation.
+       (AS_MESSAGE): Depend on $as_me preparation.
+       (AS_TMPDIR): Use AS_ERROR, rather than a hand-rolled copy.
+
 2008-10-09  Paolo Bonzini  <bonzini@gnu.org>
 
        * m4sugar/m4sh.m4 (AS_SHELL_SANITIZE): Delay setting as_me

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index b64a6cfd9f8f9a198bc00bbf6fd07fc304ff1270..6926f02ddf20c081dd93c2c3d8f77d1474d71980 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -220,9 +220,9 @@ dnl Remove any tests from suggested that are also required
               [CONFIG_SHELL=$as_shell
               as_have_required=yes
               m4_set_empty([_AS_DETECT_SUGGESTED_BODY], [break],
-                [AS_IF([_AS_RUN(m4_set_contents([_AS_DETECT_SUGGESTED_BODY]),
-                                ["$as_shell" 2> /dev/null])],
-                       [break])])])
+                [AS_IF([_AS_RUN(m4_set_contents([_AS_DETECT_SUGGESTED_BODY]),
+                                ["$as_shell" 2> /dev/null])],
+                       [break])])])
       done
 
       AS_IF([test "x$CONFIG_SHELL" != x],
@@ -457,9 +457,6 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
-dnl Delay this until after shell functions are defined.
-AS_REQUIRE([_AS_ME_PREPARE])
-
 # CDPATH.
 $as_unset CDPATH
 ])# AS_SHELL_SANITIZE
@@ -646,7 +643,8 @@ m4_define([_AS_ECHO],
 # --------------------
 # Log the string to AS_MESSAGE_LOG_FD.
 m4_define([_AS_ECHO_LOG],
-[_AS_ECHO([$as_me:$LINENO: $1], [AS_MESSAGE_LOG_FD])])
+[AS_REQUIRE([_AS_LINENO_PREPARE])dnl
+_AS_ECHO([$as_me:$LINENO: $1], [AS_MESSAGE_LOG_FD])])
 
 
 # _AS_ECHO_N_PREPARE
@@ -682,7 +680,8 @@ m4_define([_AS_ECHO_N],
 # AS_MESSAGE(STRING, [FD = AS_MESSAGE_FD])
 # ----------------------------------------
 m4_define([AS_MESSAGE],
-[m4_ifset([AS_MESSAGE_LOG_FD],
+[AS_REQUIRE([_AS_ME_PREPARE])dnl
+m4_ifset([AS_MESSAGE_LOG_FD],
          [{ _AS_ECHO_LOG([$1])
 _AS_ECHO([$as_me: $1], [$2]);}],
          [_AS_ECHO([$as_me: $1], [$2])])[]dnl
@@ -1332,7 +1331,8 @@ m4_dquote(m4_dquote(m4_defn([m4_cr_symbols2])))[[,
 # Create as safely as possible a temporary directory in DIRECTORY
 # which name is inspired by PREFIX (should be 2-4 chars max).
 m4_define([AS_TMPDIR],
-[# Create a (secure) tmp directory for tmp files.
+[AS_REQUIRE([_AS_ME_PREPARE])dnl
+# Create a (secure) tmp directory for tmp files.
 m4_if([$2], [], [: ${TMPDIR=/tmp}])
 {
   tmp=`(umask 077 && mktemp -d "m4_default([$2], [$TMPDIR])/$1XXXXXX") 2>/dev/null` &&
@@ -1341,11 +1341,7 @@ m4_if([$2], [], [: ${TMPDIR=/tmp}])
 {
   tmp=m4_default([$2], [$TMPDIR])/$1$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   AS_ECHO(["$as_me: cannot create a temporary directory in m4_default([$2], [$TMPDIR])"]) >&2
-   AS_EXIT
-}dnl
+} || AS_ERROR([cannot create a temporary directory in m4_default([$2], [$TMPDIR])])dnl
 ])# AS_TMPDIR