From: Eric Blake <ebb9@byu.net>
Date: Fri, 17 Oct 2008 19:27:20 +0000 (-0600)
Subject: Reduce vertical whitespace in configure.
X-Git-Tag: v2.63b~238
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=093eca1787cb8749b0061116a1f9ee0a90ea6e54;p=thirdparty%2Fautoconf.git

Reduce vertical whitespace in configure.

* lib/autoconf/general.m4 (AC_INIT): Silence newline output during
m4 side effect initializations.
* lib/m4sugar/m4sh.m4 (AS_PREPARE): Likewise.

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

diff --git a/ChangeLog b/ChangeLog
index fae39c78e..32bf23b8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-17  Eric Blake  <ebb9@byu.net>
+
+	Reduce vertical whitespace in configure.
+	* lib/autoconf/general.m4 (AC_INIT): Silence newline output during
+	m4 side effect initializations.
+	* lib/m4sugar/m4sh.m4 (AS_PREPARE): Likewise.
+
 2008-10-17  Eric Blake  <ebb9@byu.net>
 
 	Document AS_VAR interfaces.
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 8c858c460..83294c7ef 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1353,8 +1353,9 @@ m4_pattern_forbid([^LIBOBJS$],
 		  [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
 # Actually reserved by M4sh.
 m4_pattern_allow([^AS_FLAGS$])
-AS_INIT
-AS_PREPARE
+AS_INIT[]dnl
+AS_PREPARE[]dnl
+m4_divert_push([KILL])
 m4_ifval([$2], [_AC_INIT_PACKAGE($@)])
 _AC_INIT_DEFAULTS
 _AC_INIT_PARSE_ARGS
@@ -1366,6 +1367,8 @@ _AC_INIT_CONFIG_LOG
 _AC_INIT_PREPARE
 _AC_INIT_NOTICE
 _AC_INIT_COPYRIGHT
+m4_divert_pop
+m4_text_box([Autoconf initialization])
 m4_ifval([$2], , [m4_ifval([$1], [AC_CONFIG_SRCDIR([$1])])])dnl
 dnl
 dnl Substitute for predefined variables.
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 84b19b6cd..1feff8ffa 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -287,7 +287,8 @@ m4_popdef([AS_REQUIRE])dnl
 # AS_REQUIRE and AS_REQUIRE_SHELL_FN are defined properly, and so that
 # shell functions are placed in M4SH-INIT-FN.
 m4_defun([AS_PREPARE],
-[AS_REQUIRE([_AS_EXPR_PREPARE])
+[m4_divert_push([KILL])
+AS_REQUIRE([_AS_EXPR_PREPARE])
 AS_REQUIRE([_AS_BASENAME_PREPARE])
 AS_REQUIRE([_AS_DIRNAME_PREPARE])
 AS_REQUIRE([_AS_ME_PREPARE])
@@ -299,6 +300,7 @@ AS_REQUIRE([_AS_TEST_PREPARE])
 AS_REQUIRE([_AS_TR_CPP_PREPARE])
 AS_REQUIRE([_AS_TR_SH_PREPARE])
 AS_REQUIRE([_AS_UNSET_PREPARE])
+m4_divert_pop[]dnl
 ])