* 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 6031cd5aeafaa477c38ed3f90bc3ac48b331888a..fbdaf8c290ec6f2512b13d5330adadfc01dda343 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 3b423b64beb69b21d43a3a8c4b40f16e5ff00db8..7192fdaad06a75eb04b3f188c7a24ef4ec07f515 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 31fa6f004fa2a0db158baf6b375ab7893fe02ea7..52a02650c45df5a157365147d6d6b2debb547dc7 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 8108309d31e3125d5d7382f5ce1ed8dd7d36dd93..d7ba30f8008a7b0ca763c77f16dec98bb9db92ec 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 f208153d93f9d6f773b9cb517bcfb730c6062171..d21540a71879bb9e713c22b399d6cfbe8c06c77f 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 7f08c65a2a0957e43817f375dc71dcd3e9a1c6ca..8978165534a15082703c722b13fd89bd48d904bb 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 53ed9fc235842142268d0a4a1a68077094ced633..7ff4909ceed72ba3eeaa005ba41283d42bf16a5d 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 dfa23c2de25288c415006575abf9f58b7ccd4064..ed814cb849186eefe102357fce07b6d086c7146b 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 001b4235fba7f3f19a0ee157c9cbe116adfbf83d..d5ed8f47ddc53dabf89da92d9878513a4330a5ef 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 3866804675a9234ea5647135b021e014f88161f8..e4243be3d0b3b130f8c2c2d3100703473520d56a 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 0dcbcea5a3aef840a7a20a597c31fbfcf093cc04..baf61090869d886134b4fa8bb1859caa36ac9fa2 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 a7f4852a21b6dce113e6bb886ff9749d6ec1167e..f920d7e6fb050631a3fb0835e668b3555a1df1c0 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 8065437898aa6d2d75e904270df48eff0501036c..1a3d1064db8c30af37dc0f5293b9d8aad1491713 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 7ef1b021c5c9fb105557f575b6fef65a4dee0d3e..6f7c15ad1d2f426c1fb37ed8e808de1d75786dde 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 2152393ba455f2ba1e614910986c0be649c4e6c2..bf3b3f77a08f3c6e371fcbeef97a2e9266d5b436 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 4e66718bdd4b9db6748c1a8a43cbda93e068d82b..a3fa48569068973e2df76340f251615358b23711 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 672435c20c8d42da7cbbfbaddb66f12df6073bcf..485cae7d00119cee19b26611337e6eafbb21dffa 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 805e8d38011db3cd44a795daedfbedaf1e66838d..54be5a80b8170e0180454b0e80c7f8aa78a1e11e 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 2497d7825fac4cd696dd28fa626c5948f3c1aace..0548709076b7dddc76bdc1c4884cd07d73c8912e 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'