From: Eric Blake <ebb9@byu.net>
Date: Tue, 11 Nov 2008 17:34:08 +0000 (-0700)
Subject: Whitespace reduction in configure.
X-Git-Tag: v2.63b~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d623082df620e71f807c5db17c8330c8e3b2a8f7;p=thirdparty%2Fautoconf.git

Whitespace reduction in configure.

* lib/autoconf/autoheader.m4 (AH_VERBATIM): Avoid empty lines.
* lib/autoconf/general.m4 (_AC_INIT_PREPARE, AC_CHECK_FILES):
Likewise.
(_AC_DEFINE_Q): Restore empty line, since some clients in the wild
depend on it.

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

diff --git a/ChangeLog b/ChangeLog
index 634412a32..88ea1314c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-12  Eric Blake  <ebb9@byu.net>
+
+	Whitespace reduction in configure.
+	* lib/autoconf/autoheader.m4 (AH_VERBATIM): Avoid empty lines.
+	* lib/autoconf/general.m4 (_AC_INIT_PREPARE, AC_CHECK_FILES):
+	Likewise.
+	(_AC_DEFINE_Q): Restore empty line, since some clients in the wild
+	depend on it.
+
 2008-11-12  Eric Blake  <ebb9@byu.net>
 
 	Make M4sh, not autoconf, guarantee sane $SHELL.
diff --git a/lib/autoconf/autoheader.m4 b/lib/autoconf/autoheader.m4
index 185c0e4e1..dfc5f77d7 100644
--- a/lib/autoconf/autoheader.m4
+++ b/lib/autoconf/autoheader.m4
@@ -2,7 +2,7 @@
 # Interface with autoheader.
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002 Free Software Foundation, Inc.
+# 2002, 2008 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -68,8 +68,7 @@ m4_define([AH_OUTPUT], [])
 # Quote for Perl '' strings, which are those used by Autoheader.
 m4_define([AH_VERBATIM],
 [AS_LITERAL_IF([$1],
-	       [AH_OUTPUT([$1], AS_ESCAPE([[$2]], [\\'']))])
-])
+	       [AH_OUTPUT([$1], AS_ESCAPE([[$2]], [\\'']))])])
 
 
 # AH_TEMPLATE(KEY, DESCRIPTION)
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 1e9056a3c..4afa79467 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1333,16 +1333,16 @@ AS_ECHO(["/* confdefs.h */"]) > confdefs.h
 
 # Predefined preprocessor variables.
 AC_DEFINE_UNQUOTED([PACKAGE_NAME], ["$PACKAGE_NAME"],
-		   [Define to the full name of this package.])
+		   [Define to the full name of this package.])dnl
 AC_DEFINE_UNQUOTED([PACKAGE_TARNAME], ["$PACKAGE_TARNAME"],
-		   [Define to the one symbol short name of this package.])
+		   [Define to the one symbol short name of this package.])dnl
 AC_DEFINE_UNQUOTED([PACKAGE_VERSION], ["$PACKAGE_VERSION"],
-		   [Define to the version of this package.])
+		   [Define to the version of this package.])dnl
 AC_DEFINE_UNQUOTED([PACKAGE_STRING], ["$PACKAGE_STRING"],
-		   [Define to the full name and version of this package.])
+		   [Define to the full name and version of this package.])dnl
 AC_DEFINE_UNQUOTED([PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"],
 		   [Define to the address where bug reports for this package
-		    should be sent.])
+		    should be sent.])dnl
 
 # Let the site file select an alternate cache file if it wants to.
 AC_SITE_LOAD
@@ -2088,8 +2088,8 @@ m4_define([_AC_DEFINE_Q],
 ], [-])])], [], [],
 	[m4_warn([syntax], [AC_DEFINE]m4_ifval([$1], [], [[_UNQUOTED]])dnl
 [: `$3' is not a valid preprocessor define value])])]dnl
-[m4_ifval([$4], [AH_TEMPLATE(AC_name, [$4])])]dnl
-[_m4_popdef([AC_name])]dnl
+[m4_ifval([$4], [AH_TEMPLATE(AC_name, [$4])
+])_m4_popdef([AC_name])]dnl
 [cat >>confdefs.h <<$1_ACEOF
 [@%:@define] $2 m4_if([$#], 2, 1, [$3], [], [/**/], [$3])
 _ACEOF
@@ -2718,8 +2718,7 @@ m4_define([_AC_CHECK_FILES],
 # ACTION-IF-FOUND or ACTION-IF-NOT-FOUND.  For files that exist, also
 # provide the preprocessor variable HAVE_FILE.
 AC_DEFUN([AC_CHECK_FILES],
-[m4_map_args_w([$1], [AC_CHECK_FILE(_$0(], [)[
-$2], [$3])])])
+[m4_map_args_w([$1], [AC_CHECK_FILE(_$0(], [)[$2], [$3])])])
 
 
 ## ------------------------------- ##