reduce vertical whitespace

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Looking at configure, there was a big window of vertical whitespace.  This
narrows it to be a bit more legible (configure scripts, as generated
files, will never be perfectly easy to read, but every little bit helps.
Applying this:

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkj5B1YACgkQ84KuGfSFAYD92wCcDvhVw4cBK32FBKhUqP4Vv6QM
lDQAn2zjzYYxJbnjkln+ppXFTHJ1Dbvs
=b3Aw
-----END PGP SIGNATURE-----

>From 435d6d7eafec0ff031561891ffab7c3dd23820d4 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Fri, 17 Oct 2008 13:27:20 -0600
Subject: [PATCH] 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 <address@hidden>
---
 ChangeLog               |    7 +++++++
 lib/autoconf/general.m4 |    7 +++++--
 lib/m4sugar/m4sh.m4     |    4 +++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1755c6a..044a543 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-10-17  Eric Blake  <address@hidden>
 
+       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  <address@hidden>
+
        Document AS_VAR interfaces.
        * doc/autoconf.texi (Programming in M4sh): M4sh is now prime-time.
        (Polymorphic Variables): New node.
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 8c858c4..83294c7 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 84b19b6..1feff8f 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
 ])
 
 
-- 
1.6.0.2