obsolete: better error message if AM_CONFIG_HEADER is used

[platform/upstream/automake.git] / t / ansi2knr-no-more.sh

diff --git a/t/ansi2knr-no-more.sh b/t/ansi2knr-no-more.sh
index 99f2e92..dfb2e17 100755 (executable)
--- a/t/ansi2knr-no-more.sh
+++ b/t/ansi2knr-no-more.sh
@@ -17,7 +17,7 @@
 # Check that any attempt to use the obsolete de-ANSI-fication support
 # is diagnosed.
 
-. ./defs || Exit 1
+. test-init.sh
 
 warn_rx='automatic de-ANSI-fication.*removed'
 
@@ -28,12 +28,12 @@ cp configure.ac configure.sav
 
 echo AM_C_PROTOTYPES >> configure.ac
 
-$ACLOCAL -Wnone 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL -Wnone 2>stderr && { cat stderr >&2; exit 1; }
 cat stderr >&2
 grep "^configure\\.ac:5:.*$warn_rx" stderr
 
-cat aclocal.sav "$am_automake_acdir"/protos.m4 > aclocal.m4
-$AUTOCONF -Wnone 2>stderr && { cat stderr >&2; Exit 1; }
+cat aclocal.sav "$am_automake_acdir"/obsolete-err.m4 > aclocal.m4
+$AUTOCONF -Wnone 2>stderr && { cat stderr >&2; exit 1; }
 cat stderr >&2
 grep "^configure\\.ac:5:.*$warn_rx" stderr
 
@@ -45,7 +45,7 @@ for opt in ansi2knr lib/ansi2knr; do
   AUTOMAKE_fails -Wnone
   grep "^Makefile\.am:1:.*$warn_rx" stderr
   # ansi2knr option in configure.ac
-  echo > Makefile.am # 'echo', not ':', for Solaris /bin/sh.
+  : > Makefile.am
   sed "s|^\\(AM_INIT_AUTOMAKE\\).*|\1([$opt])|" configure.sav >configure.ac
   cat configure.ac # For debugging.
   rm -rf autom4te*.cache