update to autoconf-2.12

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9689 dc483132-0cff-0310-8789-dd5450dbe970

2 files changed, 20 insertions, 3 deletions

diff --git a/src/util/autoconf/testsuite/Makefile.in b/src/util/autoconf/testsuite/Makefile.in
index feab545c4..7c9586013 100644
--- a/src/util/autoconf/testsuite/Makefile.in
+++ b/src/util/autoconf/testsuite/Makefile.in
@@ -40,8 +40,13 @@ all:
 info:
 dvi:
 
-check: site.exp all
-	@echo This only works if you have the DejaGNU runtest program installed...
+dejacheck:
+	@if $(SHELL) -c 'runtest --version' > /dev/null 2>&1; then :; else \
+	  echo ERROR: the autoconf tests require the DejaGNU runtest program; \
+	  exit 1; \
+	fi
+
+check: dejacheck site.exp all
 	$(RUNTEST) $(RUNTESTFLAGS) --tool autoconf AUTOCONF=${AUTOCONF} \
 	AUTOCONFFLAGS="${AUTOCONFFLAGS}" --srcdir $(srcdir)
 
diff --git a/src/util/autoconf/testsuite/config/unix.exp b/src/util/autoconf/testsuite/config/unix.exp
index cf4f08afd..8d19d740d 100644
--- a/src/util/autoconf/testsuite/config/unix.exp
+++ b/src/util/autoconf/testsuite/config/unix.exp
@@ -88,8 +88,20 @@ 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
+    catch "exec ./$args --cache=/dev/null >/dev/null" exec_output
     if $verbose>1 then {
 	send_user "Executed $args --cache=/dev/null\n"
     }