From: David MacKenzie <djm@djmnet.org>
Date: Wed, 20 Nov 1996 22:16:05 +0000 (+0000)
Subject: more cleanups
X-Git-Tag: fsf-origin~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85669bdcb12e103eb6ffc4f7432c7f2a1e84562b;p=thirdparty%2Fautoconf.git

more cleanups
---

diff --git a/ChangeLog b/ChangeLog
index 03cb0d38..3370b58b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
 Wed Nov 20 13:00:21 1996  David J MacKenzie  <djm@catapult.va.pubnix.com>
 
+	* Test release 2.11.2.
+
+	* acgeneral.m4 (AC_OUTPUT): Remove a now-wrong test for whether to
+	make an unquoted here document.
+
 	* Test release 2.11.1.
 
 	* acgeneral.m4 (AC_TRY_LIB): Remove an erroneous dnl.
-	(AC_TRY_COMPILE): Make the final newline consistent with the
-	other AC_TRY_* macros.
+	(AC_TRY_COMPILE, AC_TRY_LINK): Make the final newline consistent
+	with the other AC_TRY_* macros.
 	(AC_DIVERSION_CMDS, AC_DIVERSION_ICMDS): New macros.
 	(AC_OUTPUT_COMMANDS, AC_OUTPUT): Use them instead of appending to
 	list macros.
diff --git a/acgeneral.m4 b/acgeneral.m4
index d070d98d..b217289d 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -52,7 +52,7 @@ dnl
 divert(-1)dnl Throw away output until AC_INIT is called.
 changequote([, ])
 
-define(AC_ACVERSION, 2.11.1)
+define(AC_ACVERSION, 2.11.2)
 
 dnl Some old m4's don't support m4exit.  But they provide
 dnl equivalent functionality by core dumping because of the
@@ -1979,13 +1979,12 @@ cat >> $CONFIG_STATUS <<EOF
 AC_OUTPUT_FILES($1)
 ifdef([AC_LIST_HEADER], [AC_OUTPUT_HEADER(AC_LIST_HEADER)])dnl
 ifdef([AC_LIST_LINKS], [AC_OUTPUT_LINKS(AC_LIST_FILES, AC_LIST_LINKS)])dnl
-ifelse([$3][AC_LIST_INIT], , ,
-[EOF
+EOF
 cat >> $CONFIG_STATUS <<EOF
 undivert(AC_DIVERSION_ICMDS)dnl
 $3
 EOF
-cat >> $CONFIG_STATUS <<\EOF])
+cat >> $CONFIG_STATUS <<\EOF
 undivert(AC_DIVERSION_CMDS)dnl
 $2
 exit 0
diff --git a/autoconf.texi b/autoconf.texi
index 7a11d2d8..d31a7b32 100644
--- a/autoconf.texi
+++ b/autoconf.texi
@@ -6,8 +6,8 @@
 @c @setchapternewpage odd
 @c %**end of header
 
-@set EDITION 2.11.1
-@set VERSION 2.11.1
+@set EDITION 2.11.2
+@set VERSION 2.11.2
 @set UPDATED November 1996
 
 @iftex
diff --git a/configure b/configure
index 1ce9be09..16668ef2 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.11.1 
+# Generated automatically using autoconf version 2.11.2 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -332,7 +332,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.11.1"
+    echo "configure generated by autoconf version 2.11.2"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -835,7 +835,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.11.1"
+    echo "$CONFIG_STATUS generated by autoconf version 2.11.2"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 7a11d2d8..d31a7b32 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -6,8 +6,8 @@
 @c @setchapternewpage odd
 @c %**end of header
 
-@set EDITION 2.11.1
-@set VERSION 2.11.1
+@set EDITION 2.11.2
+@set VERSION 2.11.2
 @set UPDATED November 1996
 
 @iftex
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index d070d98d..b217289d 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -52,7 +52,7 @@ dnl
 divert(-1)dnl Throw away output until AC_INIT is called.
 changequote([, ])
 
-define(AC_ACVERSION, 2.11.1)
+define(AC_ACVERSION, 2.11.2)
 
 dnl Some old m4's don't support m4exit.  But they provide
 dnl equivalent functionality by core dumping because of the
@@ -1979,13 +1979,12 @@ cat >> $CONFIG_STATUS <<EOF
 AC_OUTPUT_FILES($1)
 ifdef([AC_LIST_HEADER], [AC_OUTPUT_HEADER(AC_LIST_HEADER)])dnl
 ifdef([AC_LIST_LINKS], [AC_OUTPUT_LINKS(AC_LIST_FILES, AC_LIST_LINKS)])dnl
-ifelse([$3][AC_LIST_INIT], , ,
-[EOF
+EOF
 cat >> $CONFIG_STATUS <<EOF
 undivert(AC_DIVERSION_ICMDS)dnl
 $3
 EOF
-cat >> $CONFIG_STATUS <<\EOF])
+cat >> $CONFIG_STATUS <<\EOF
 undivert(AC_DIVERSION_CMDS)dnl
 $2
 exit 0