Merge branch 'maint'

[platform/upstream/automake.git] / t / ac-output-old.tap

diff --git a/t/ac-output-old.tap b/t/ac-output-old.tap
index 5ba3d3e..2039674 100755 (executable)
--- a/t/ac-output-old.tap
+++ b/t/ac-output-old.tap
@@ -18,14 +18,12 @@
 # line breaking in the use of AC_OUTPUT.  Synthesised by a bunch
 # of older tests (referenced below).
 
-. ./defs || Exit 1
+. ./defs || exit 1
 
 plan_ 22
 
 rm -f configure.ac depcomp # Not required.
 
-AUTOMAKE="$AUTOMAKE -Wno-obsolete"
-
 # -----------------------------------------------------------------------
 
 # Test for bug reported by François Pinard.
@@ -54,18 +52,15 @@ acoutbs_check ()
 }
 
 acoutbs_check 1 << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_INIT([acoutbs1], [1.0])
+AM_INIT_AUTOMAKE
 AC_OUTPUT(Makefile \
 zot)
 END
 
 acoutbs_check 2 << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AC_ARG_PROGRAM
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
+AC_INIT([acoutbs2], [1.0])
+AM_INIT_AUTOMAKE
 AC_OUTPUT(\
    Makefile \
    zot
@@ -85,8 +80,8 @@ mkdir acoutnoq
 cd acoutnoq
 
 cat > configure.ac << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_INIT([acoutnoq], [1.0])
+AM_INIT_AUTOMAKE
 AC_OUTPUT(Makefile, [true])
 END
 
@@ -107,8 +102,8 @@ mkdir acoutpt
 cd acoutpt
 
 cat > configure.ac << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_INIT([acoutpt], [1.0])
+AM_INIT_AUTOMAKE
 AC_OUTPUT([Makefile], [true])
 END
 
@@ -146,7 +141,7 @@ mkdir subdir
 command_ok_ "aclocal and AC_OUTPUT ($cur)" $ACLOCAL
 command_ok_ "automake and AC_OUTPUT ($cur)" $AUTOMAKE
 command_ok_ "foo.in mentioned two times in Makefile.in ($cur)" \
-             test `$FGREP foo.in Makefile.in | wc -l` -eq 2
+             test $($FGREP -c 'foo.in' Makefile.in) -eq 2
 
 # This ought to work as well.
 command_ok_ "'automake -a -f' and AC_OUTPUT ($cur)" \
@@ -163,8 +158,8 @@ mkdir acoutqnl
 cd acoutqnl
 
 cat > configure.ac << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(nonesuch, nonesuch)
+AC_INIT([acoutqnl], [1.0])
+AM_INIT_AUTOMAKE
 AC_OUTPUT([Makefile],
 [echo zardoz has spoken])
 END
@@ -179,4 +174,4 @@ cd ..
 # -----------------------------------------------------------------------
 
 # And we're done.
-Exit 0
+exit 0