From 65bcd04475020c8fc71132d8f6dabdffb7a64dd7 Mon Sep 17 00:00:00 2001
From: David MacKenzie <djm@djmnet.org>
Date: Wed, 20 Nov 1996 22:53:55 +0000
Subject: [PATCH] more fixups

---
 ChangeLog                 |  8 +++++---
 acgeneral.m4              |  6 +++---
 autoconf.texi             |  8 +++-----
 doc/autoconf.texi         |  8 +++-----
 lib/autoconf/general.m4   |  6 +++---
 testsuite/config/unix.exp | 12 ++++++++++++
 6 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3370b58b..cdd3faa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,9 +7,11 @@ Wed Nov 20 13:00:21 1996  David J MacKenzie  <djm@catapult.va.pubnix.com>
 
 	* Test release 2.11.1.
 
-	* acgeneral.m4 (AC_TRY_LIB): Remove an erroneous dnl.
-	(AC_TRY_COMPILE, AC_TRY_LINK): Make the final newline consistent
-	with the other AC_TRY_* macros.
+	* acgeneral.m4 (AC_TRY_COMPILE, AC_TRY_LINK): Make the final
+	newline consistent with the other AC_TRY_* macros: no final dnl
+	is needed to avoid extraneous blank lines.
+	(AC_CHECK_LIB, AC_HAVE_LIBRARY, AC_COMPILE_CHECK): Remove
+	extraneous dnl's.
 	(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 b217289d..ba1e5779 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1528,7 +1528,7 @@ AC_MSG_CHECKING([for -l[]AC_LIB_NAME])
 AC_CACHE_VAL(AC_CV_NAME,
 [ac_save_LIBS="$LIBS"
 LIBS="-l[]AC_LIB_NAME[] $4 $LIBS"
-AC_TRY_LINK( , [main()], AC_CV_NAME=yes, AC_CV_NAME=no)dnl
+AC_TRY_LINK( , [main()], AC_CV_NAME=yes, AC_CV_NAME=no)
 LIBS="$ac_save_LIBS"
 ])dnl
 AC_MSG_RESULT($AC_CV_NAME)
@@ -1649,7 +1649,7 @@ AC_DEFUN(AC_COMPILE_CHECK,
 [AC_OBSOLETE([$0], [; instead use AC_TRY_COMPILE or AC_TRY_LINK, and AC_MSG_CHECKING and AC_MSG_RESULT])dnl
 ifelse([$1], , , [AC_CHECKING([for $1])
 ])dnl
-AC_TRY_LINK([$2], [$3], [$4], [$5])dnl
+AC_TRY_LINK([$2], [$3], [$4], [$5])
 ])
 
 dnl AC_TRY_LINK(INCLUDES, FUNCTION-BODY,
@@ -1786,7 +1786,7 @@ choke me
 #else
 $1();
 #endif
-], eval "ac_cv_func_$1=yes", eval "ac_cv_func_$1=no")])dnl
+], eval "ac_cv_func_$1=yes", eval "ac_cv_func_$1=no")])
 if eval "test \"`echo '$ac_cv_func_'$1`\" = yes"; then
   AC_MSG_RESULT(yes)
   ifelse([$2], , :, [$2])
diff --git a/autoconf.texi b/autoconf.texi
index d31a7b32..5b750d42 100644
--- a/autoconf.texi
+++ b/autoconf.texi
@@ -3487,11 +3487,9 @@ For example, @samp{broken} or @samp{set}.  This part of the name may
 be omitted if it does not apply.
 @end table
 
-Like their names, the values that may be assigned to cache variables
-have a few restrictions.  The values may not contain single quotes or
-curly braces.  Usually, their values will be boolean (@samp{yes} or
-@samp{no}) or the names of files or functions; so this is not an
-important restriction.
+The values assigned to cache variables may not contain newlines.
+Usually, their values will be boolean (@samp{yes} or @samp{no}) or the
+names of files or functions; so this is not an important restriction.
 
 @node Cache Files, ,  Cache Variable Names, Caching Results
 @subsection Cache Files
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index d31a7b32..5b750d42 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -3487,11 +3487,9 @@ For example, @samp{broken} or @samp{set}.  This part of the name may
 be omitted if it does not apply.
 @end table
 
-Like their names, the values that may be assigned to cache variables
-have a few restrictions.  The values may not contain single quotes or
-curly braces.  Usually, their values will be boolean (@samp{yes} or
-@samp{no}) or the names of files or functions; so this is not an
-important restriction.
+The values assigned to cache variables may not contain newlines.
+Usually, their values will be boolean (@samp{yes} or @samp{no}) or the
+names of files or functions; so this is not an important restriction.
 
 @node Cache Files, ,  Cache Variable Names, Caching Results
 @subsection Cache Files
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index b217289d..ba1e5779 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1528,7 +1528,7 @@ AC_MSG_CHECKING([for -l[]AC_LIB_NAME])
 AC_CACHE_VAL(AC_CV_NAME,
 [ac_save_LIBS="$LIBS"
 LIBS="-l[]AC_LIB_NAME[] $4 $LIBS"
-AC_TRY_LINK( , [main()], AC_CV_NAME=yes, AC_CV_NAME=no)dnl
+AC_TRY_LINK( , [main()], AC_CV_NAME=yes, AC_CV_NAME=no)
 LIBS="$ac_save_LIBS"
 ])dnl
 AC_MSG_RESULT($AC_CV_NAME)
@@ -1649,7 +1649,7 @@ AC_DEFUN(AC_COMPILE_CHECK,
 [AC_OBSOLETE([$0], [; instead use AC_TRY_COMPILE or AC_TRY_LINK, and AC_MSG_CHECKING and AC_MSG_RESULT])dnl
 ifelse([$1], , , [AC_CHECKING([for $1])
 ])dnl
-AC_TRY_LINK([$2], [$3], [$4], [$5])dnl
+AC_TRY_LINK([$2], [$3], [$4], [$5])
 ])
 
 dnl AC_TRY_LINK(INCLUDES, FUNCTION-BODY,
@@ -1786,7 +1786,7 @@ choke me
 #else
 $1();
 #endif
-], eval "ac_cv_func_$1=yes", eval "ac_cv_func_$1=no")])dnl
+], eval "ac_cv_func_$1=yes", eval "ac_cv_func_$1=no")])
 if eval "test \"`echo '$ac_cv_func_'$1`\" = yes"; then
   AC_MSG_RESULT(yes)
   ifelse([$2], , :, [$2])
diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp
index 31cc117b..8d19d740 100644
--- a/testsuite/config/unix.exp
+++ b/testsuite/config/unix.exp
@@ -88,6 +88,18 @@ proc autoconf_load { args } {
 	return 0
     }
 
+    # Check whether m4 processing left any icky residue.
+    # The autoconf script does this already, pretty much.
+    # catch "exec sed -n -e /dnl/p -e /AC_/p $args" exec_output
+    # if $verbose>1 then {
+    #	send_user "Checked $args for unexpanded m4 macros\n"
+    # }
+    # if ![string match "" $exec_output] then {
+    #	fail "$args, unexpanded m4 macros"
+    #	send_log "$exec_output\n"
+    #	return 0
+    # }
+
     # Capture only stderr in exec_output, not "creating Makefile" etc.
     catch "exec ./$args --cache=/dev/null >/dev/null" exec_output
     if $verbose>1 then {