* aclocal.test: Put AM_INIT_AUTOMAKE into configure.in.

	* library.test: Use AC_EXEEXT.
	* texinfo5.test: Use AC_EXEEXT.
	* Many files: use AC_PROG_INSTALL, not AM_PROG_INSTALL.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 6031cd5..fbdaf8c 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,10 @@
 Sat Sep 26 19:17:43 1998  Tom Tromey  <tromey@cygnus.com>
 
+       * aclocal.test: Put AM_INIT_AUTOMAKE into configure.in.
+       * library.test: Use AC_EXEEXT.
+       * texinfo5.test: Use AC_EXEEXT.
+       * Many files: use AC_PROG_INSTALL, not AM_PROG_INSTALL.
+
        Test suite updates for the @SHELL@ change:
        * exsource.test: Set SHELL on `make' command line.
        * ansi.test: Set SHELL on `make' command line.

diff --git a/tests/aclocal.test b/tests/aclocal.test
index 3b423b6..7192fda 100755 (executable)
--- a/tests/aclocal.test
+++ b/tests/aclocal.test
@@ -4,5 +4,8 @@
 # Alexandre Oliva.
 . $srcdir/defs || exit 1
 
+# configure.in has to have some macro that aclocal can find.
+echo 'AM_INIT_AUTOMAKE' >> configure.in
+
 $ACLOCAL --output=fred || exit 1
 test -f fred

diff --git a/tests/conf2.test b/tests/conf2.test
index 31fa6f0..52a0265 100755 (executable)
--- a/tests/conf2.test
+++ b/tests/conf2.test
@@ -10,7 +10,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_PROG_CC
 AC_ARG_PROGRAM
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 AC_OUTPUT(Makefile)
 END
 

diff --git a/tests/confsub.test b/tests/confsub.test
index 8108309..d7ba30f 100755 (executable)
--- a/tests/confsub.test
+++ b/tests/confsub.test
@@ -11,7 +11,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_PROG_CC
 AC_ARG_PROGRAM
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 AC_OUTPUT(Makefile subdir/Makefile)
 END
 

diff --git a/tests/defs b/tests/defs
index f208153..d21540a 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -28,7 +28,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 AC_OUTPUT(Makefile)
 END
 

diff --git a/tests/depend2.test b/tests/depend2.test
index 7f08c65..8978165 100755 (executable)
--- a/tests/depend2.test
+++ b/tests/depend2.test
@@ -11,7 +11,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_MAKE_SET
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 AC_PROG_CC
 AC_OUTPUT(Makefile src/Makefile)
 END

diff --git a/tests/depend3.test b/tests/depend3.test
index 53ed9fc..7ff4909 100755 (executable)
--- a/tests/depend3.test
+++ b/tests/depend3.test
@@ -8,7 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 AC_PROG_CC
 AC_SUBST(DEPS)
 AC_OUTPUT(Makefile)

diff --git a/tests/fpinst2.test b/tests/fpinst2.test
index dfa23c2..ed814cb 100755 (executable)
--- a/tests/fpinst2.test
+++ b/tests/fpinst2.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Test to make sure "reversed" order of AM_PROG_INSTALL and
+# Test to make sure "reversed" order of AC_PROG_INSTALL and
 # AC_PROG_INSTALL is not buggy.
 
 . $srcdir/defs || exit 1
@@ -9,7 +9,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)
 END

diff --git a/tests/fpinstall.test b/tests/fpinstall.test
index 001b423..d5ed8f4 100755 (executable)
--- a/tests/fpinstall.test
+++ b/tests/fpinstall.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Test for bug reported by Thomas Morgan.  If both AM_PROG_INSTALL and
+# Test for bug reported by Thomas Morgan.  If both AC_PROG_INSTALL and
 # AC_PROG_INSTALL appear in configure.in, bad error results.
 
 . $srcdir/defs || exit 1
@@ -10,7 +10,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 AC_OUTPUT(Makefile)
 END
 

diff --git a/tests/gnits.test b/tests/gnits.test
index 3866804..e4243be 100755 (executable)
--- a/tests/gnits.test
+++ b/tests/gnits.test
@@ -8,7 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=3.5.3.2
 AC_ARG_PROGRAM
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 AC_OUTPUT(Makefile)
 END
 

diff --git a/tests/library.test b/tests/library.test
index 0dcbcea..baf6109 100755 (executable)
--- a/tests/library.test
+++ b/tests/library.test
@@ -7,7 +7,7 @@
 cat >> configure.in << 'END'
 AC_PROG_RANLIB
 AM_MAINTAINER_MODE
-AM_EXEEXT
+AC_EXEEXT
 AC_PROG_CC
 END
 

diff --git a/tests/package.test b/tests/package.test
index a7f4852..f920d7e 100755 (executable)
--- a/tests/package.test
+++ b/tests/package.test
@@ -6,7 +6,7 @@
 
 cat > configure.in << 'END'
 AC_ARG_PROGRAM
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 AC_OUTPUT(Makefile)
 END
 

diff --git a/tests/proginst.test b/tests/proginst.test
index 8065437..1a3d106 100755 (executable)
--- a/tests/proginst.test
+++ b/tests/proginst.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Test for bug where when multiple scripts are installed,
-# the check for AM_PROG_INSTALL fails.
+# the check for AC_PROG_INSTALL fails.
 
 . $srcdir/defs || exit 1
 

diff --git a/tests/scripts.test b/tests/scripts.test
index 7ef1b02..6f7c15a 100755 (executable)
--- a/tests/scripts.test
+++ b/tests/scripts.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Test for bug reported by Jim Meyering.
-# AM_PROG_INSTALL was required when only noinst_SCRIPTS was defined.
+# AC_PROG_INSTALL was required when only noinst_SCRIPTS was defined.
 
 . $srcdir/defs || exit 1
 

diff --git a/tests/stamph.test b/tests/stamph.test
index 2152393..bf3b3f7 100755 (executable)
--- a/tests/stamph.test
+++ b/tests/stamph.test
@@ -8,7 +8,7 @@ cat > configure.in << 'END'
 PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 AC_OUTPUT(Makefile stamp-h)
 END
 

diff --git a/tests/subdir.test b/tests/subdir.test
index 4e66718..a3fa485 100755 (executable)
--- a/tests/subdir.test
+++ b/tests/subdir.test
@@ -12,7 +12,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_MAKE_SET
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 AC_OUTPUT(Makefile zot/Makefile)
 END
 

diff --git a/tests/subdir2.test b/tests/subdir2.test
index 672435c..485cae7 100755 (executable)
--- a/tests/subdir2.test
+++ b/tests/subdir2.test
@@ -12,7 +12,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_MAKE_SET
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 AC_OUTPUT(Makefile one/Makefile one/two/Makefile)
 END
 

diff --git a/tests/tagsub.test b/tests/tagsub.test
index 805e8d3..54be5a8 100755 (executable)
--- a/tests/tagsub.test
+++ b/tests/tagsub.test
@@ -22,7 +22,7 @@ PACKAGE=nonesuch
 VERSION=nonesuch
 AC_ARG_PROGRAM
 AC_PROG_MAKE_SET
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 AC_OUTPUT(Makefile sub/Makefile)
 END
 

diff --git a/tests/texinfo5.test b/tests/texinfo5.test
index 2497d78..0548709 100755 (executable)
--- a/tests/texinfo5.test
+++ b/tests/texinfo5.test
@@ -6,7 +6,7 @@
 
 cat >> configure.in << 'END'
 AM_MAINTAINER_MODE
-AM_EXEEXT
+AC_EXEEXT
 END
 
 cat > Makefile.am << 'END'