[PATCH] Ditch _AS_LINENO_PREPARE from _AS_PREPARE

[Paolo Bonzini]

Paolo Bonzini wrote:

> Since
> _AS_PREPARE has invoked AS_PREPARE and required _AS_LINENO_PREPARE in
> the parent, we know that there will be no $LINENO in the child script
> unless $LINENO works.

This gives fewer forks in the initalization of config.status.

Ok?

Paolo

2008-10-30  Paolo Bonzini  <address@hidden>

        * lib/m4sugar/m4sh.m4 (_AS_PREPARE): Remove _AS_LINENO_PREPARE,
        say why.

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 372f042..3d80bdc 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -285,6 +285,10 @@ _m4_popdef([AS_EXIT])])# _AS_DETECT_BETTER_SHELL
 # important not to forget some: config.status needs them.
 # List any preparations that create shell functions first, then
 # topologically sort the others by their dependencies.
+#
+# Special case: we do not need _AS_LINENO_PREPARE, because the
+# parent will have substituted $LINENO for us when processing its
+# own invocation of _AS_LINENO_PREPARE.
 m4_defun([_AS_PREPARE],
 [m4_pushdef([AS_REQUIRE])]dnl
 [m4_pushdef([AS_REQUIRE_SHELL_FN], _m4_defn([_AS_REQUIRE_SHELL_FN])
@@ -298,7 +302,6 @@ _AS_BASENAME_PREPARE
 _AS_DIRNAME_PREPARE
 _AS_ME_PREPARE
 _AS_CR_PREPARE
-_AS_LINENO_PREPARE
 _AS_ECHO_N_PREPARE
 _AS_LN_S_PREPARE
 _AS_MKDIR_P_PREPARE