* tests/acoutnoq.test, tests/acoutput.test, tests/acoutput2.test,

* tests/acoutqnl.test, tests/acouttbs.test, tests/all.test,
* tests/alpha.test, tests/ansi.test, tests/asm.test,
* tests/auxdir.test, tests/auxdir2.test, tests/backsl2.test,
* tests/badline.test, tests/block.test, tests/canon2.test,
* tests/check.test, tests/checkall.test, tests/clean.test,
* tests/colneq.test, tests/colneq2.test, tests/colon.test,
* tests/colon2.test, tests/colon3.test, tests/colon4.test,
* tests/colon5.test, tests/colon6.test, tests/colon7.test,
* tests/comment.test, tests/comment3.test, tests/cond.test,
* tests/cond2.test, tests/cond6.test, tests/cond7.test,
* tests/condincl.test, tests/condincl2.test, tests/condman.test,
* tests/condman2.test, tests/confdist.test, tests/confh.test,
* tests/confh2.test, tests/confh3.test, tests/confvar.test,
* tests/confvar2.test, tests/copy.test, tests/ctarget1.test,
* tests/cxxcpp.test, tests/dash.test, tests/dejagnu.test,
* tests/dejagnu2.test, tests/distcommon.test, tests/distdir.test,
* tests/else.test, tests/empty.test, tests/exdir.test,
* tests/exdir2.test, tests/extra3.test, tests/extra4.test,
* tests/flibs.test, tests/fnoc.test, tests/fo.test,
* tests/fonly.test, tests/fortdep.test, tests/fpinst2.test,
* tests/fpinstall.test, tests/gcj2.test, tests/gnits.test,
* tests/include.test, tests/info.test, tests/insh.test,
* tests/insh2.test, tests/install.test, tests/installsh.test,
* tests/instdata.test, tests/instdata2.test, tests/instexec.test,
* tests/insthook.test, tests/instman.test, tests/instman2.test,
* tests/java.test, tests/javaprim.test, tests/javasubst.test,
* tests/libobj3.test, tests/link_f_only.test, tests/lisp.test,
* tests/man.test, tests/mclean.test, tests/mdate.test,
* tests/mdate2.test, tests/mdate3.test, tests/mdate4.test,
* tests/mkinst2.test, tests/mkinstall.test, tests/nodepcomp.test,
* tests/noinst.test, tests/obsolete.test, tests/obsolete2.test,
* tests/outdir.test, tests/output.test, tests/output2.test,
* tests/output3.test, tests/output4.test, tests/output5.test,
* tests/package.test, tests/pluseq.test, tests/pluseq2.test,
* tests/pluseq3.test, tests/pluseq5.test, tests/pluseq6.test,
* tests/pluseq8.test, tests/ppf77.test, tests/pr2.test,
* tests/primary.test, tests/proginst.test, tests/python.test,
* tests/remake.test, tests/remake2.test, tests/remake3.test,
* tests/rulepat.test, tests/scripts.test, tests/seenc.test,
* tests/sinclude.test, tests/spell.test, tests/spell3.test,
* tests/spelling.test, tests/stamph.test, tests/subdir.test,
* tests/subdir2.test, tests/subdircond.test, tests/subst.test,
* tests/symlink.test, tests/symlink2.test, tests/symlink3.test,
* tests/syntax.test, tests/tags.test, tests/tagsub.test,
* tests/texinfo.test, tests/texinfo10.test, tests/texinfo2.test,
* tests/texinfo3.test, tests/texinfo4.test, tests/texinfo5.test,
* tests/texinfo6.test, tests/texinfo7.test, tests/texinfo8.test,
* tests/texinfo9.test, tests/vars.test, tests/vartar.test,
* tests/version.test, tests/version2.test, tests/version3.test,
* tests/version4.test, tests/vpath.test, tests/vtexi.test,
* tests/vtexi2.test, tests/werror.test: Run aclocal before automake.

diff --git a/ChangeLog b/ChangeLog
index 2441d7c8f797bc88a1ce0d5f79036bf5027e036b..9c801d131e5b689e0f24722a98701720c4dbc43d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+2001-10-20  Akim Demaille  <akim@epita.fr>
+
+       * tests/acoutnoq.test, tests/acoutput.test, tests/acoutput2.test,
+       * tests/acoutqnl.test, tests/acouttbs.test, tests/all.test,
+       * tests/alpha.test, tests/ansi.test, tests/asm.test,
+       * tests/auxdir.test, tests/auxdir2.test, tests/backsl2.test,
+       * tests/badline.test, tests/block.test, tests/canon2.test,
+       * tests/check.test, tests/checkall.test, tests/clean.test,
+       * tests/colneq.test, tests/colneq2.test, tests/colon.test,
+       * tests/colon2.test, tests/colon3.test, tests/colon4.test,
+       * tests/colon5.test, tests/colon6.test, tests/colon7.test,
+       * tests/comment.test, tests/comment3.test, tests/cond.test,
+       * tests/cond2.test, tests/cond6.test, tests/cond7.test,
+       * tests/condincl.test, tests/condincl2.test, tests/condman.test,
+       * tests/condman2.test, tests/confdist.test, tests/confh.test,
+       * tests/confh2.test, tests/confh3.test, tests/confvar.test,
+       * tests/confvar2.test, tests/copy.test, tests/ctarget1.test,
+       * tests/cxxcpp.test, tests/dash.test, tests/dejagnu.test,
+       * tests/dejagnu2.test, tests/distcommon.test, tests/distdir.test,
+       * tests/else.test, tests/empty.test, tests/exdir.test,
+       * tests/exdir2.test, tests/extra3.test, tests/extra4.test,
+       * tests/flibs.test, tests/fnoc.test, tests/fo.test,
+       * tests/fonly.test, tests/fortdep.test, tests/fpinst2.test,
+       * tests/fpinstall.test, tests/gcj2.test, tests/gnits.test,
+       * tests/include.test, tests/info.test, tests/insh.test,
+       * tests/insh2.test, tests/install.test, tests/installsh.test,
+       * tests/instdata.test, tests/instdata2.test, tests/instexec.test,
+       * tests/insthook.test, tests/instman.test, tests/instman2.test,
+       * tests/java.test, tests/javaprim.test, tests/javasubst.test,
+       * tests/libobj3.test, tests/link_f_only.test, tests/lisp.test,
+       * tests/man.test, tests/mclean.test, tests/mdate.test,
+       * tests/mdate2.test, tests/mdate3.test, tests/mdate4.test,
+       * tests/mkinst2.test, tests/mkinstall.test, tests/nodepcomp.test,
+       * tests/noinst.test, tests/obsolete.test, tests/obsolete2.test,
+       * tests/outdir.test, tests/output.test, tests/output2.test,
+       * tests/output3.test, tests/output4.test, tests/output5.test,
+       * tests/package.test, tests/pluseq.test, tests/pluseq2.test,
+       * tests/pluseq3.test, tests/pluseq5.test, tests/pluseq6.test,
+       * tests/pluseq8.test, tests/ppf77.test, tests/pr2.test,
+       * tests/primary.test, tests/proginst.test, tests/python.test,
+       * tests/remake.test, tests/remake2.test, tests/remake3.test,
+       * tests/rulepat.test, tests/scripts.test, tests/seenc.test,
+       * tests/sinclude.test, tests/spell.test, tests/spell3.test,
+       * tests/spelling.test, tests/stamph.test, tests/subdir.test,
+       * tests/subdir2.test, tests/subdircond.test, tests/subst.test,
+       * tests/symlink.test, tests/symlink2.test, tests/symlink3.test,
+       * tests/syntax.test, tests/tags.test, tests/tagsub.test,
+       * tests/texinfo.test, tests/texinfo10.test, tests/texinfo2.test,
+       * tests/texinfo3.test, tests/texinfo4.test, tests/texinfo5.test,
+       * tests/texinfo6.test, tests/texinfo7.test, tests/texinfo8.test,
+       * tests/texinfo9.test, tests/vars.test, tests/vartar.test,
+       * tests/version.test, tests/version2.test, tests/version3.test,
+       * tests/version4.test, tests/vpath.test, tests/vtexi.test,
+       * tests/vtexi2.test, tests/werror.test: Run aclocal before automake.
+
 2001-10-20  Akim Demaille  <akim@epita.fr>
 
        * tests/acoutnoq.test, tests/acoutput.test, tests/acoutqnl.test,

diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test
index b281bb5713f02356d93cd930a2ca8dafd12141a9..3e9cc7b88f70b50ab9fd48b6708604fab32b16f6 100755 (executable)
--- a/tests/acoutnoq.test
+++ b/tests/acoutnoq.test
@@ -18,4 +18,5 @@ END
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/acoutput.test b/tests/acoutput.test
index 5918a74eaf47a406cf8daf8135085d5bb4ce77bc..aa41caa6da84b3d6960b92f882d18e5131dd718f 100755 (executable)
--- a/tests/acoutput.test
+++ b/tests/acoutput.test
@@ -15,4 +15,5 @@ END
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/acoutput2.test b/tests/acoutput2.test
index 3c2488db27d58fc5ab1a5e44063b71cae3c4100b..6af5440d9398bc29d1b049fb0e2423800b396dfd 100755 (executable)
--- a/tests/acoutput2.test
+++ b/tests/acoutput2.test
@@ -17,10 +17,12 @@ mkdir subdir
 : > foo.in
 : > subdir/foo.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 count=`fgrep foo.in Makefile.in | wc -l`
 test $count -eq 2 || exit 1
 
 # This ought to work as well.
+$ACLOCAL || exit 1
 $AUTOMAKE --add-missing --force-missing

diff --git a/tests/acoutqnl.test b/tests/acoutqnl.test
index 40d37f3a2160fb6b743cebc43aef5473f3bf8e5f..39101abcf98b0fb14f2a954248cb87058a372d2d 100755 (executable)
--- a/tests/acoutqnl.test
+++ b/tests/acoutqnl.test
@@ -15,5 +15,6 @@ END
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE
 

diff --git a/tests/acouttbs.test b/tests/acouttbs.test
index a5fa37fe0668140d088bfe986737da75562ad49b..07e79c704edb43c483b22e0856346ab6b76a7831 100755 (executable)
--- a/tests/acouttbs.test
+++ b/tests/acouttbs.test
@@ -17,4 +17,5 @@ END
 : > Makefile.am
 : > zot.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/all.test b/tests/all.test
index 61e129282147a12859755b6b88eedb5e24508b59..2387dbe763b506308ef1b955ea832ffd1642e446 100755 (executable)
--- a/tests/all.test
+++ b/tests/all.test
@@ -8,7 +8,8 @@ for target in all install-exec install-data uninstall; do
    echo "Doing $target"
    echo "${target}-local:" > Makefile.am
 
-   $AUTOMAKE || exit 1
+   $ACLOCAL || exit 1
+$AUTOMAKE || exit 1
 
    fgrep "${target}-local ${target}-local" Makefile.in && exit 1
 done

diff --git a/tests/alpha.test b/tests/alpha.test
index 4add83d1947aa3be44852ede84e6a5bdd263922e..923e0b8b6bc11fc1a228ccf54e698e841d2f6d4c 100755 (executable)
--- a/tests/alpha.test
+++ b/tests/alpha.test
@@ -24,6 +24,7 @@ END
 : > ChangeLog
 : > THANKS
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep README-alpha Makefile.in

diff --git a/tests/ansi.test b/tests/ansi.test
index 0e133c29802ac1e33f2bdfae336fea950223e0d7..3b7da79e06842ef282369504e7ca2b4bb206a494 100755 (executable)
--- a/tests/ansi.test
+++ b/tests/ansi.test
@@ -18,6 +18,7 @@ END
 : > ansi2knr.c
 : > ansi2knr.1
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed

diff --git a/tests/asm.test b/tests/asm.test
index ee2fe3bc94953ad6f56dd941865320ea83f53fe2..6fdbea36697ac88792495b4ce258e2cfeffbe986 100755 (executable)
--- a/tests/asm.test
+++ b/tests/asm.test
@@ -20,6 +20,7 @@ END
 
 # Should fail because we need cc and as.
 echo 1
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 
 cat > configure.in << 'END'
@@ -32,6 +33,7 @@ END
 
 # We still need as.
 echo 2
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 
 cat > configure.in << 'END'
@@ -45,6 +47,7 @@ END
 
 # We need ASFLAGS.
 echo 3
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 
 cat > configure.in << 'END'
@@ -58,4 +61,5 @@ AC_OUTPUT(Makefile)
 END
 
 echo 4
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/auxdir.test b/tests/auxdir.test
index cf6872d4634bacf7e603945f3d027ca3fcf860de..8b42f689d4df05a67bf8be396d8c9a707d4dc6f7 100755 (executable)
--- a/tests/auxdir.test
+++ b/tests/auxdir.test
@@ -17,6 +17,7 @@ END
 
 # The "././" prefix confuses Automake into thinking it is doing a
 # subdir build.  Yes, this is hacky.
+$ACLOCAL || exit 1
 $AUTOMAKE ././Makefile || exit 1
 
 grep '/\./\./mkinstalldirs' Makefile.in

diff --git a/tests/auxdir2.test b/tests/auxdir2.test
index 1251fbe7a731feb4c16dc44ac03af33a43be43f2..891dc61af1256497685d6d9685ff5847d9e5fdf8 100755 (executable)
--- a/tests/auxdir2.test
+++ b/tests/auxdir2.test
@@ -12,4 +12,5 @@ END
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/backsl2.test b/tests/backsl2.test
index 9d3dcb2c6cc62afd2a22e5b00d54312343f8ddd5..ae3eaaeaae97e7e4f91bc856cabbf5e954fb41f0 100755 (executable)
--- a/tests/backsl2.test
+++ b/tests/backsl2.test
@@ -10,6 +10,7 @@ SUBDIRS = \
    .
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 exit 0

diff --git a/tests/badline.test b/tests/badline.test
index 16ad12823588b4f55597a116a931c468fd523fa0..3ad0358ecadd2439b407ec5dc07cce411c492799 100755 (executable)
--- a/tests/badline.test
+++ b/tests/badline.test
@@ -11,6 +11,7 @@ END
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE > out 2>&1 && exit 1
 grep Makefile out && exit 1
 exit 0

diff --git a/tests/block.test b/tests/block.test
index 8ec8c25c43c5644ffe647cc787b8ed56423f39bf..a9d23003336d15121440d320f4a8bf935f82e710 100755 (executable)
--- a/tests/block.test
+++ b/tests/block.test
@@ -13,6 +13,7 @@ cat > Makefile.am << 'END'
 #END
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 (sed -e '/^#START/,/^#END/ !d' Makefile.in | grep -v '^#') && exit 1

diff --git a/tests/canon2.test b/tests/canon2.test
index 0efe346085d559ed0e77b55c4a63db705b8678c7..ea60dda179c255158c92a888e15acf7573623e9b 100755 (executable)
--- a/tests/canon2.test
+++ b/tests/canon2.test
@@ -13,6 +13,7 @@ END
 echo '@setfilename zar-doz.info' > zar-doz.texi
 echo '@setfilename frob' > frob.texi
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep zar-doz_TEXINFOS Makefile.in && exit 1

diff --git a/tests/check.test b/tests/check.test
index 2cf75083c4dc1ed864adbe1cf72705421626ad5c..4f9945a3d4c222e9a697d18f5baf813e9341b95a 100755 (executable)
--- a/tests/check.test
+++ b/tests/check.test
@@ -10,6 +10,7 @@ END
 
 : > frob.test
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^check-TESTS:' Makefile.in || exit 1

diff --git a/tests/checkall.test b/tests/checkall.test
index 34b72304d2ea92c877cf7414deca847d07c16fd5..625daa8be2e694aefc9cd699b3f6c07e020b4a95 100755 (executable)
--- a/tests/checkall.test
+++ b/tests/checkall.test
@@ -10,6 +10,7 @@ check-local:
        true
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^check-am:.*all-am' Makefile.in || exit 1

diff --git a/tests/clean.test b/tests/clean.test
index e34173f6a30a1ee1d42b20d84100ed2591a053f6..b0942cc20a547d7320be0365587840838eeb9f37 100755 (executable)
--- a/tests/clean.test
+++ b/tests/clean.test
@@ -6,6 +6,7 @@
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^clean-am:.*mostlyclean-am' Makefile.in

diff --git a/tests/colneq.test b/tests/colneq.test
index e3db4947d69ab8c08f03028ac3518b222c662829..23ec0d0b7367176f760813cf87492990ed0b1d2c 100755 (executable)
--- a/tests/colneq.test
+++ b/tests/colneq.test
@@ -9,4 +9,5 @@ ICONS := $(wildcard *.xbm)
 data_DATA = $(ICONS)
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/colneq2.test b/tests/colneq2.test
index a5af04ca2bc85100df2cb65eba8e44362b1a91e5..458328f725d350af96f679a84f82446b1b81cba7 100755 (executable)
--- a/tests/colneq2.test
+++ b/tests/colneq2.test
@@ -13,4 +13,5 @@ END
 : > b.test
 : > c.test
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/colon.test b/tests/colon.test
index 6da5ef8df76c889cd83d793a79a1bb4f180bf123..f143973a74af8a77d3e5cfb160e642726a15d3f3 100755 (executable)
--- a/tests/colon.test
+++ b/tests/colon.test
@@ -17,4 +17,5 @@ END
 : > foo.hin
 : > stamp-h.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/colon2.test b/tests/colon2.test
index 60aa1afeaa6ac25adba6e056fcf46a73b2d118c7..afa2bf3423898fe9d734ff9872cd6c858e38b196 100755 (executable)
--- a/tests/colon2.test
+++ b/tests/colon2.test
@@ -14,6 +14,7 @@ END
 
 : > zardoz.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 # We actually check several things here.

diff --git a/tests/colon3.test b/tests/colon3.test
index 4252b24fade5df348c011f4993916bc343ea4938..29913dbb8c3ca4b4bae4e1520e7a33eee8871ef6 100755 (executable)
--- a/tests/colon3.test
+++ b/tests/colon3.test
@@ -17,6 +17,7 @@ END
 : > two.in
 : > three.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 # We actually check several things here.

diff --git a/tests/colon4.test b/tests/colon4.test
index a041a2a172fb30c5a9a9343a43c724dec8f812c9..d433c4412f547bb8c78d35092e89e53beae5aade 100755 (executable)
--- a/tests/colon4.test
+++ b/tests/colon4.test
@@ -19,6 +19,7 @@ END
 : > two
 : > three
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 # The rule should regenerate the file "zardoz".

diff --git a/tests/colon5.test b/tests/colon5.test
index e27712cd2016eab4608d153e60b49ef42d643320..799d5e3a5d30c3e911536e1c93b3c29224f1ad83 100755 (executable)
--- a/tests/colon5.test
+++ b/tests/colon5.test
@@ -15,6 +15,7 @@ END
 : > Makefile.am
 : > Makefile.dep
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep 'Makefile:Makefile.in' Makefile.in

diff --git a/tests/colon6.test b/tests/colon6.test
index 9bc496e52bbe7eb72e539b5a49781f1506de66c0..36e3cd6b10cb0fd026c8106d8a657eeac684fe70 100755 (executable)
--- a/tests/colon6.test
+++ b/tests/colon6.test
@@ -17,4 +17,5 @@ mkdir demo
 : > demo/Makefile.am
 : > demo/version.gin
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/colon7.test b/tests/colon7.test
index 3ccf811e08a9c3a5a109713371f5cde44125094b..a56012e6f15888ad0af5f969bfd4d24b7a52f5e8 100755 (executable)
--- a/tests/colon7.test
+++ b/tests/colon7.test
@@ -22,6 +22,7 @@ mkdir subdir
 : > subdir/Makefile.am
 : > subdir/foo
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 # shouldn't have any bar.in

diff --git a/tests/comment.test b/tests/comment.test
index 1d2b4f34eb63836599b76a2597810055873fcbfe..863c0cdfc96cc20a79d00ca14013994844ba83fb 100755 (executable)
--- a/tests/comment.test
+++ b/tests/comment.test
@@ -9,4 +9,5 @@ cat > Makefile.am << 'END'
 AUTOMAKE_OPTIONS = #no such option
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/comment3.test b/tests/comment3.test
index 01d83231922917b5e93b5c297a5b9d0b4e06709b..017c0a7c426e5342e0ed886f2ffd18d121090cdd 100755 (executable)
--- a/tests/comment3.test
+++ b/tests/comment3.test
@@ -12,5 +12,6 @@ install-data-local:
        # Tru64 Unix must die
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/cond.test b/tests/cond.test
index 348618f1883ad2e290adb1a245e7b96405d862b4..fb8b0d83993f7d1ce5b0663e57bf9e5c7d8c51e4 100755 (executable)
--- a/tests/cond.test
+++ b/tests/cond.test
@@ -20,6 +20,7 @@ endif
 END
 
 set -e
+$ACLOCAL || exit 1
 $AUTOMAKE
 
 grep '^@TEST_TRUE@VAR = true$' Makefile.in

diff --git a/tests/cond2.test b/tests/cond2.test
index 271ae01af41e64204df216fe170a82ffd9db1891..7ac7fc30edb477adb494f80e162762ad3291a601 100755 (executable)
--- a/tests/cond2.test
+++ b/tests/cond2.test
@@ -22,5 +22,6 @@ END
 
 mkdir dir1
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/cond6.test b/tests/cond6.test
index 7ea2510fb68031b0864f94994aa61f9a35952feb..7502e01343c5e88e18fe2625013377e9fcfed46f 100755 (executable)
--- a/tests/cond6.test
+++ b/tests/cond6.test
@@ -23,4 +23,5 @@ help_DATA = foo
 endif
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/cond7.test b/tests/cond7.test
index 7a257b4b4cb7a3c3f83ea37ad494457071df1363..ee3709f18150e952d8b46283a38ffd283c77cd6d 100755 (executable)
--- a/tests/cond7.test
+++ b/tests/cond7.test
@@ -21,6 +21,7 @@ ab_HEADERS = \
 endif
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 grep '002' Makefile.in && exit 1
 exit 0

diff --git a/tests/condincl.test b/tests/condincl.test
index 0dfb451f105d636ab83d5f283ec94f75deea6380..22f0753d73f3308a20d0e123d9dd90ec7bc6d923 100755 (executable)
--- a/tests/condincl.test
+++ b/tests/condincl.test
@@ -19,6 +19,7 @@ target: dependency
        rule
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^target' Makefile.in && exit 1

diff --git a/tests/condincl2.test b/tests/condincl2.test
index 59b2a29019cde3d07e37877272b5377b614a828b..3b068be65a2846d0962ca63442427593db799d92 100755 (executable)
--- a/tests/condincl2.test
+++ b/tests/condincl2.test
@@ -20,5 +20,6 @@ target: dependency
 endif
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/condman.test b/tests/condman.test
index 4559c94d4dc725dff5b296fbeb7b820ea309237b..ebeaa3f874cef30e33d461f544077b4c9e0cac3f 100755 (executable)
--- a/tests/condman.test
+++ b/tests/condman.test
@@ -18,4 +18,5 @@ END
 : > foo.1
 : > joe.1
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/condman2.test b/tests/condman2.test
index 941b24e220e0a87fa594e639b171e24f4da0a769..be087cdddd3aa0805ff5d57fdad52a13d9b89dee 100755 (executable)
--- a/tests/condman2.test
+++ b/tests/condman2.test
@@ -8,6 +8,7 @@ man_MANS = foo.1 foo.2
 man5_MANS = foo.5
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^install-man1:' Makefile.in || exit 1

diff --git a/tests/confdist.test b/tests/confdist.test
index f02307e5cfdbac50932053975fb50499acd531f9..76fcce1258b9f65691046024db07316e16e3b21d 100755 (executable)
--- a/tests/confdist.test
+++ b/tests/confdist.test
@@ -7,6 +7,7 @@
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^DIST_COMMON.*configure ' Makefile.in

diff --git a/tests/confh.test b/tests/confh.test
index 8ae200108fcc0f33045485b99d3fad2dd0ea3ca0..b19f3c0e534caf602c4fd2fe6530f33206981f81 100755 (executable)
--- a/tests/confh.test
+++ b/tests/confh.test
@@ -21,6 +21,7 @@ mkdir include
 : > include/Makefile.am
 : > include/config.h.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 (sed -n -e '/^DIST_COMMON =.*\\$/ {
@@ -37,5 +38,6 @@ grep 'stamp-h.in:.*acconfig.h' include/Makefile.in || exit 1
 # Make sure re-running automake in a different way generates same
 # Makefile.in.
 mv Makefile.in save
+$ACLOCAL || exit 1
 $AUTOMAKE Makefile || exit 1
 cmp Makefile.in save

diff --git a/tests/confh2.test b/tests/confh2.test
index a7daa34195baee1416cf719bb0fa70410d939c67..97e12a3c3c227426a330cf3f557267370e312a56 100755 (executable)
--- a/tests/confh2.test
+++ b/tests/confh2.test
@@ -20,6 +20,7 @@ END
 mkdir include
 : > include/config.h.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^config.h:' Makefile.in || exit 1

diff --git a/tests/confh3.test b/tests/confh3.test
index fdf9f7b40e6da88db770ccfa262a9bd840554fec..d804cc8939fe903538131d25dffc8476ceea471c 100755 (executable)
--- a/tests/confh3.test
+++ b/tests/confh3.test
@@ -23,6 +23,7 @@ mkdir d1 d2
 
 : > d2/config.h.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^config.h:' d1/Makefile.in || exit 1

diff --git a/tests/confvar.test b/tests/confvar.test
index fdae95f4c3eef38fce863e320dcbb0771db1409a..9fa06aab55636eb3cce80fe23c3140ceccb684b6 100755 (executable)
--- a/tests/confvar.test
+++ b/tests/confvar.test
@@ -10,6 +10,7 @@ END
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^QBERT' Makefile.in

diff --git a/tests/confvar2.test b/tests/confvar2.test
index a1f5c619865a1c1622c601d46973c15228816300..13566a49b1ff95397f6f4868dca3163c8edf1673 100755 (executable)
--- a/tests/confvar2.test
+++ b/tests/confvar2.test
@@ -12,4 +12,5 @@ cat > Makefile.am << 'END'
 bin_SCRIPTS = foo
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/copy.test b/tests/copy.test
index dc1de49b2f77fd07e50e3062dcad928a250f5688..6426df950017571d8ba55a547f8f8b50a44185fc 100755 (executable)
--- a/tests/copy.test
+++ b/tests/copy.test
@@ -7,4 +7,5 @@
 : > Makefile.am
 rm -f install-sh
 
+$ACLOCAL || exit 1
 $AUTOMAKE -c -a

diff --git a/tests/ctarget1.test b/tests/ctarget1.test
index dff9bc4b013a2a101e7527aa91c59a308527c32a..6d32c0ef05d274f5495e976cc746a4614bbc7b22 100755 (executable)
--- a/tests/ctarget1.test
+++ b/tests/ctarget1.test
@@ -22,6 +22,7 @@ END
 
 set -e
 
+$ACLOCAL || exit 1
 $AUTOMAKE
 grep '^@TEST_TRUE@target: true' Makefile.in
 grep '^@TEST_TRUE@     action' Makefile.in

diff --git a/tests/cxxcpp.test b/tests/cxxcpp.test
index 0a90fc78a45fda601983b176bb3daf91814e4a42..e15fd113164d444021faa28f69826896829f5fd1 100755 (executable)
--- a/tests/cxxcpp.test
+++ b/tests/cxxcpp.test
@@ -11,6 +11,7 @@ END
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^CXXCPP' Makefile.in

diff --git a/tests/dash.test b/tests/dash.test
index a3e2da699867e60b50d1d8a1c5d831b10ced71e8..a95112c7dc019c2019e86c7f5008fb9a449c02a0 100755 (executable)
--- a/tests/dash.test
+++ b/tests/dash.test
@@ -11,4 +11,5 @@ END
 
 : > Make-lang
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/dejagnu.test b/tests/dejagnu.test
index 55459fdec9c6fde0c0763bd3f990ac1c37107717..f68dbf0810c4d33f0aa18c1f5e56c83f0cfb1cae 100755 (executable)
--- a/tests/dejagnu.test
+++ b/tests/dejagnu.test
@@ -11,6 +11,7 @@ END
 
 : > frob.test
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^check-TESTS' Makefile.in

diff --git a/tests/dejagnu2.test b/tests/dejagnu2.test
index f99163a2658ee18250192732962125385a1f12dd..23d54d833cdf2e7726e995b071e83e787024fbe8 100755 (executable)
--- a/tests/dejagnu2.test
+++ b/tests/dejagnu2.test
@@ -11,6 +11,7 @@ site.exp:
     echo foo
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep site.exp Makefile.in

diff --git a/tests/distcommon.test b/tests/distcommon.test
index f7297de599152b57fe6e3e7cbf8271d7b4186730..4a3db7da88d9b921e5ed7140a01d57f7cc0adfec 100755 (executable)
--- a/tests/distcommon.test
+++ b/tests/distcommon.test
@@ -20,6 +20,7 @@ mkdir subdir
 : > subdir/Makefile.am
 : > subdir/bar.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 # verify bar.in

diff --git a/tests/distdir.test b/tests/distdir.test
index cfc15d9f5fed726531e89d8e6adb72f8d1acbd8b..c632000965ba84557403679dc8ef9f23d11d6d8d 100755 (executable)
--- a/tests/distdir.test
+++ b/tests/distdir.test
@@ -9,6 +9,7 @@ cat > Makefile.am << 'END'
 EXTRA_DIST = foo/bar ./joe
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '\$(mkinstalldirs).*\.' Makefile.in && exit 1

diff --git a/tests/else.test b/tests/else.test
index a1cd725ddb0fae6ca3c5a4921c14e92964796762..3aad8de0186b09a83b56b4587afb505af0ef77cc 100755 (executable)
--- a/tests/else.test
+++ b/tests/else.test
@@ -18,5 +18,6 @@ SUBDIRS = c java
 endif
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE > out 2>&1 && exit 1
 grep :7: out

diff --git a/tests/empty.test b/tests/empty.test
index 112b2c6bdd8d697c8571bb56ff1a59bdaea8c6a6..e5cd3211562c90381dcdd95464143498bccd5cdf 100755 (executable)
--- a/tests/empty.test
+++ b/tests/empty.test
@@ -9,6 +9,7 @@ cat > Makefile.am << 'END'
 data_DATA =
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 # Create configure so Makefile doesn't look out-of-date.

diff --git a/tests/exdir.test b/tests/exdir.test
index 0ef3cbe5a7236f2e7caf17fb1b312ee9a5dd019d..1400b5f89f3f597c033f6cc07ef99151aacd1fe0 100755 (executable)
--- a/tests/exdir.test
+++ b/tests/exdir.test
@@ -10,6 +10,7 @@ html_DATA = zot.html
 pkgdata_DATA = qbert
 EOF
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^DATA' Makefile.in | grep html

diff --git a/tests/exdir2.test b/tests/exdir2.test
index 7dbdfb6cd1feb667507dacecb3f7a3055f26496a..02713878ec0b598f789401fd5bd51e2042175b64 100755 (executable)
--- a/tests/exdir2.test
+++ b/tests/exdir2.test
@@ -9,5 +9,6 @@ html_DATA = zot.html
 pkgdata_DATA = qbert
 EOF
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/extra3.test b/tests/extra3.test
index 5c9a48553f3684fcc5b6d8231903025602fb84a4..44091885fb0f378b5c8a547660e3369e17176e63 100755 (executable)
--- a/tests/extra3.test
+++ b/tests/extra3.test
@@ -10,4 +10,5 @@ cat > Makefile.am << 'END'
 sysconf_DATA = @CODICIL@
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/extra4.test b/tests/extra4.test
index b652fba21f9a9198308c7fd3b52653a102d39efc..934bafc9ef9b28cb9f5ab9e7e25c0b51a113c2f3 100755 (executable)
--- a/tests/extra4.test
+++ b/tests/extra4.test
@@ -11,4 +11,5 @@ sysconf_DATA = @CODICIL@
 EXTRA_DATA = codicil.txt
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/flibs.test b/tests/flibs.test
index a4978f959c1ad0315cbe1fcbbf132a6c26669038..f8c69fbdd635261d71756c358fa9c8034d6b899e 100755 (executable)
--- a/tests/flibs.test
+++ b/tests/flibs.test
@@ -32,6 +32,7 @@ END
 
 : > zardoz.f
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '@FLIBS@' Makefile.in

diff --git a/tests/fnoc.test b/tests/fnoc.test
index f264d390a7c0e016bad94dfd27db58ffcac366d4..445931c6e8e10a1b575fc3a87d62137aeda0127a 100755 (executable)
--- a/tests/fnoc.test
+++ b/tests/fnoc.test
@@ -18,6 +18,7 @@ END
 : > doe.f
 : > jane.f
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '[^F]CC' Makefile.in | grep -v MKDEP && exit 1

diff --git a/tests/fo.test b/tests/fo.test
index 2b4b425ff39406bb93cee71c23f1a21d343f17de..3c76e08ca5e994c34bfc7abfc30727f7adf1cdaf 100755 (executable)
--- a/tests/fo.test
+++ b/tests/fo.test
@@ -16,6 +16,7 @@ END
 
 : > doe.f
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep 'doe.$(OBJEXT)' Makefile.in

diff --git a/tests/fonly.test b/tests/fonly.test
index 392b6762006f1a737383e0e1b0549bd49fd21c3b..e418447d629255fe14982cf1981e6ba3f5a8a639 100755 (executable)
--- a/tests/fonly.test
+++ b/tests/fonly.test
@@ -30,6 +30,7 @@ END
 
 : > zardoz.f
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep 'zardoz.f' Makefile.in

diff --git a/tests/fortdep.test b/tests/fortdep.test
index 225a75089577973c6e84d5613b4df53c3b755e00..d751c8013ce1a41af6052b96fe9ab20128dcb976 100755 (executable)
--- a/tests/fortdep.test
+++ b/tests/fortdep.test
@@ -21,6 +21,7 @@ END
 
 : > foo.f
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep 'foo\.Po' Makefile.in && exit 1

diff --git a/tests/fpinst2.test b/tests/fpinst2.test
index 1351173db200baceb8226be169d67798ec49ad13..7637ccc9f472fe9cb592dc57018dc45067a704b0 100755 (executable)
--- a/tests/fpinst2.test
+++ b/tests/fpinst2.test
@@ -17,4 +17,5 @@ cat > Makefile.am <<'END'
 bin_SCRIPTS = zot
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

diff --git a/tests/fpinstall.test b/tests/fpinstall.test
index 841096445f340de80406afd082dce6658e283460..a47b736daac2b8e4ddeb5b59648bfd7364ebc68e 100755 (executable)
--- a/tests/fpinstall.test
+++ b/tests/fpinstall.test
@@ -17,4 +17,5 @@ cat > Makefile.am <<'END'
 bin_SCRIPTS = zot
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

diff --git a/tests/gcj2.test b/tests/gcj2.test
index 3a4320f18f42fcfee536ce02ce317632a2d57421..11c808b2f848671a5438b281b535a99a69de3f30 100755 (executable)
--- a/tests/gcj2.test
+++ b/tests/gcj2.test
@@ -14,5 +14,6 @@ bin_PROGRAMS = convert
 convert_SOURCES = x/../convert.java
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/gnits.test b/tests/gnits.test
index 19471b36c59906144267f92375d375bd32697450..f7895ed656495458753e00cbdbd011fea35de574 100755 (executable)
--- a/tests/gnits.test
+++ b/tests/gnits.test
@@ -23,5 +23,6 @@ END
 : > ChangeLog
 : > THANKS
 
+$ACLOCAL || exit 1
 $AUTOMAKE --gnits && exit 1
 exit 0

diff --git a/tests/include.test b/tests/include.test
index 179ab612bdb3ccbfb029df16df9fa3e63e1fa621..0f0d8e5d8461dbda6fa62ac068311aa3b887b4b9 100755 (executable)
--- a/tests/include.test
+++ b/tests/include.test
@@ -11,6 +11,7 @@ END
 
 : > foo
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 len="`grep '^srcdir' Makefile.in | wc -l`"
 echo "len = $len"

diff --git a/tests/info.test b/tests/info.test
index f5c3cfa5b8b692ea0f417fbccf22a457a75c13bb..77d3e983605af374b2ea4d1c580b796b5b8015d7 100755 (executable)
--- a/tests/info.test
+++ b/tests/info.test
@@ -14,6 +14,7 @@ END
 echo '@setfilename foo.info' > foo.texi
 : > texinfo.tex
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 for i in `grep '^INFOS =' Makefile.in | sed -e 's/^INFOS = //'`; do

diff --git a/tests/insh.test b/tests/insh.test
index 53e6acd90acae7dac23fe39c6ad8d203e8faad00..2ebf918e555631de47c8892e4a7030d4e8d217e6 100755 (executable)
--- a/tests/insh.test
+++ b/tests/insh.test
@@ -9,6 +9,7 @@ rm -f mkinstalldirs
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE > out 2>&1 && exit 1
 
 grep mkinstalldirs out

diff --git a/tests/insh2.test b/tests/insh2.test
index 9f35a6c20bd2a6487a3d7f2ce4dfdb023e730642..001050083bb19827718fe2e1366ca02b0561ddb3 100755 (executable)
--- a/tests/insh2.test
+++ b/tests/insh2.test
@@ -10,6 +10,7 @@ magic:
        @echo $(DISTFILES)
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed

diff --git a/tests/install.test b/tests/install.test
index 031b97c4248950a229079d3d30f0cf30e6acacd0..7bc77c5669c155ae4399b843ca04b654f70004cc 100755 (executable)
--- a/tests/install.test
+++ b/tests/install.test
@@ -13,7 +13,8 @@
 # It isn't possible to write this test.  That's because all files that
 # might be required are actually included in the automake
 # distribution.
-# $AUTOMAKE --gnu --add-missing > output 2>&1 && exit 1
+# $ACLOCAL || exit 1
+$AUTOMAKE --gnu --add-missing > output 2>&1 && exit 1
 # grep installing output
 
 exit 0

diff --git a/tests/installsh.test b/tests/installsh.test
index e1130230bb6af9f1840bdef7224ce22ccf524247..214f822ee597b2a8c553a4f435306fe4819296fc 100755 (executable)
--- a/tests/installsh.test
+++ b/tests/installsh.test
@@ -28,6 +28,7 @@ esac
 AUTOMAKE="$PERL ../../../automake --libdir=$srcdir/../lib --foreign"
 
 # Now we proceed with the test
+$ACLOCAL || exit 1
 $AUTOMAKE --add-missing > output 2>&1 \
    || exit 1
 

diff --git a/tests/instdata.test b/tests/instdata.test
index 134ca1c747592980dbbae1fdb84ac4deb6ceb5ab..6362b38706e4973e5c88e4f27018088dcb847c57 100755 (executable)
--- a/tests/instdata.test
+++ b/tests/instdata.test
@@ -9,6 +9,7 @@ echo 'AC_SUBST(INSTALL_DATA)' >> configure.in
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 (grep '^DATA =' Makefile.in | grep INSTALL_DATA) && exit 1

diff --git a/tests/instdata2.test b/tests/instdata2.test
index 569e6c13125fa91b42c5ea554d5a3b9956e0888e..73dbd2ad1b36036c5bd5e06037b6e1b94046f667 100755 (executable)
--- a/tests/instdata2.test
+++ b/tests/instdata2.test
@@ -49,6 +49,7 @@ pkgdata_SCRIPTS = script
 EOF
 
 set -e
+$ACLOCAL || exit 1
 $AUTOMAKE
 
 # install-SCRIPTS targets.

diff --git a/tests/instexec.test b/tests/instexec.test
index 98480a015aca22a8593e50561d0770769640320f..3361d26f4c5238ed71628ee836967ede812a6835 100755 (executable)
--- a/tests/instexec.test
+++ b/tests/instexec.test
@@ -7,6 +7,7 @@
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^install-exec:' Makefile.in

diff --git a/tests/insthook.test b/tests/insthook.test
index 82876bf1db817386f2c252d62f9e53d6f3c9f614..7950bb244fb897a81acab010851b09962ae1e135 100755 (executable)
--- a/tests/insthook.test
+++ b/tests/insthook.test
@@ -10,6 +10,7 @@ install-exec-hook:
        @echo nothing
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 test "`grep install-exec-hook Makefile.in | wc -l`" -gt 1 || exit 1

diff --git a/tests/instman.test b/tests/instman.test
index 60d231bdb9bcb696064d8e2c9364c5bb65a9b4c2..f225f598835f1af5d5199812ab6e98e90e7c87c4 100755 (executable)
--- a/tests/instman.test
+++ b/tests/instman.test
@@ -11,6 +11,7 @@ EOF
 
 : > frob.8
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '[^(/]mkinstalldirs' Makefile.in > out || exit 1

diff --git a/tests/instman2.test b/tests/instman2.test
index fb4401051d5c390cdbaeee537a10e544ffc348d9..5e8f7b256ac71318770c57c0ef589d7e5fee27b1 100755 (executable)
--- a/tests/instman2.test
+++ b/tests/instman2.test
@@ -11,6 +11,7 @@ EOF
 
 : > frob.8
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^install-man' Makefile.in

diff --git a/tests/java.test b/tests/java.test
index 47a2992f8df3ffde50ea57a78b309778b305a70f..d2e1944b9dcb975dc07030525b996cfce17309d4 100755 (executable)
--- a/tests/java.test
+++ b/tests/java.test
@@ -9,5 +9,6 @@ javadir = $(datadir)/java
 java_JAVA = a.java b.java c.java
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 grep '^all[-a-z]*:.*classjava\.stamp' Makefile.in

diff --git a/tests/javaprim.test b/tests/javaprim.test
index 640ce79874df31c838bf834a938d1600f1e7fc82..d6b54a930679107918621a1612c54572b9cdc0ce 100755 (executable)
--- a/tests/javaprim.test
+++ b/tests/javaprim.test
@@ -11,4 +11,5 @@ javadir = $(datadir)/java
 java_JAVA = a.java b.java c.java
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/javasubst.test b/tests/javasubst.test
index 1743115ff7262c19c6411a4ec395de6fbbd39269..8880bbacc2bbce47eb1eece0be4953321e91a20e 100755 (executable)
--- a/tests/javasubst.test
+++ b/tests/javasubst.test
@@ -11,6 +11,7 @@ javadir = $(datadir)/java
 java_JAVA = a.java b.java c.java
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep 'JAVAC.*@JAVAC@' Makefile.in

diff --git a/tests/libobj3.test b/tests/libobj3.test
index 3c7ca654bd92a53c98f6af4cb123db640ceb04ec..f078e0e9cfb6a3002c134fd7d02f08c1582875ec 100755 (executable)
--- a/tests/libobj3.test
+++ b/tests/libobj3.test
@@ -14,5 +14,6 @@ libtu_a_SOURCES =
 libtu_a_LIBADD = @LIBOBJS@
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/link_f_only.test b/tests/link_f_only.test
index ca5779340dd34d280f20988de63247d6073b7875..5dfcdcdc0c8837e094dada61511e999c5676cc10 100755 (executable)
--- a/tests/link_f_only.test
+++ b/tests/link_f_only.test
@@ -16,6 +16,7 @@ END
 
 : > lamp.f
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 

diff --git a/tests/lisp.test b/tests/lisp.test
index fa7366f7b345b11f67af7476dbac7913603aa2b7..ae8a6c68681ba35002fb2ed5b128d116c41c440e 100755 (executable)
--- a/tests/lisp.test
+++ b/tests/lisp.test
@@ -15,6 +15,7 @@ END
 : > foo.el
 : > elisp-comp
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^ELCFILES.*ELCFILES' Makefile.in && exit 1

diff --git a/tests/man.test b/tests/man.test
index c6a6d81f84528f55f780a7479691f748b5d42317..4e6de69318ae58c0f7f37600cad05977bd3e9459 100755 (executable)
--- a/tests/man.test
+++ b/tests/man.test
@@ -12,5 +12,6 @@ END
 : > foo.1
 : > bar.man
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 grep '^MANS ' Makefile.in

diff --git a/tests/mclean.test b/tests/mclean.test
index 78b879445c078d937ae0e6f8f3184e1b545ac43a..2c59ca258f809bcf8d42a20a786b8a44672a5b5e 100755 (executable)
--- a/tests/mclean.test
+++ b/tests/mclean.test
@@ -11,6 +11,7 @@ END
 
 : > FOO
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep 'rm -f .*MAINTAINERCLEANFILES' Makefile.in

diff --git a/tests/mdate.test b/tests/mdate.test
index c0619e8931c9816d97b74b38e3adfe337906e451..fe5ca02b0d306f7a49122722cb617a59c0d9836f 100755 (executable)
--- a/tests/mdate.test
+++ b/tests/mdate.test
@@ -16,4 +16,5 @@ END
 # Required when using Texinfo.
 : > texinfo.tex
 
+$ACLOCAL || exit 1
 $AUTOMAKE 2>&1 > /dev/null | grep 'required file.*mdate-sh'

diff --git a/tests/mdate2.test b/tests/mdate2.test
index ef19458327600d2349c7a55c2a6f05d420a7a51f..d9e5b0900d269033e012ea1427d8fd4607a66d67 100755 (executable)
--- a/tests/mdate2.test
+++ b/tests/mdate2.test
@@ -18,6 +18,7 @@ END
 echo '@setfilename textutils' > textutils.texi
 
 # Use "././" to confuse Automake into thinking this is a subdir build.
+$ACLOCAL || exit 1
 $AUTOMAKE ././Makefile || exit 1
 
 grep 'mdate-sh' Makefile.in | grep -v SHELL

diff --git a/tests/mdate3.test b/tests/mdate3.test
index 8440c5aef9cf84c570301916d3cc40902099de7f..693fee0b98d19e83a74517bc068e0e4889a961d9 100755 (executable)
--- a/tests/mdate3.test
+++ b/tests/mdate3.test
@@ -27,6 +27,7 @@ mv missing foo
 mv mkinstalldirs foo
 mv depcomp foo
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '[^/]mdate-sh' Makefile.in && exit 1

diff --git a/tests/mdate4.test b/tests/mdate4.test
index f6dc86760378f57df46d0f7d6e66e8ca8a704f57..9cbb1100d0f5a68a67fb0420d6814af9499f21fb 100755 (executable)
--- a/tests/mdate4.test
+++ b/tests/mdate4.test
@@ -26,5 +26,6 @@ cat > sub/textutils.texi << 'END'
 @setfilename textutils.info
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE -a || exit 1
 test -f sub/mdate-sh

diff --git a/tests/mkinst2.test b/tests/mkinst2.test
index b30e46dfc3fcf1e692ca1d662d501cd7ec7d9f09..73b0e76b8ec64f1321f3464ffd36a8e10074863a 100755 (executable)
--- a/tests/mkinst2.test
+++ b/tests/mkinst2.test
@@ -17,6 +17,7 @@ END
 
 chmod +x mkinstalldirs
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 ($MAKE -s -f Makefile.in installdirs | grep man) && exit 1

diff --git a/tests/mkinstall.test b/tests/mkinstall.test
index eed6e8fea691685143b38b0b45f7a56832606303..90a1403c81d98d4886564f0d87fa6a24b923ca3c 100755 (executable)
--- a/tests/mkinstall.test
+++ b/tests/mkinstall.test
@@ -10,6 +10,7 @@ END
 
 # The "././" prefix confuses Automake into thinking it is doing a
 # subdir build.  Yes, this is hacky.
+$ACLOCAL || exit 1
 $AUTOMAKE ././Makefile || exit 1
 
 grep ' /mkinstalldirs' Makefile.in && exit 1

diff --git a/tests/nodepcomp.test b/tests/nodepcomp.test
index 8f59c4b3e5ac0eb8ab533be375044c7f0d59a87d..88f3882bc8658f03689883b416e007463ec40862 100755 (executable)
--- a/tests/nodepcomp.test
+++ b/tests/nodepcomp.test
@@ -8,4 +8,5 @@ rm -f depcomp
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/noinst.test b/tests/noinst.test
index d5970a8dbccfae34de19f07a04d993176db03f63..1910434e1d94a6eb077ee262373ccf89453a99bc 100755 (executable)
--- a/tests/noinst.test
+++ b/tests/noinst.test
@@ -10,6 +10,7 @@ all-local:
        exit 1
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^install[-a-z]*:.* all' Makefile.in

diff --git a/tests/obsolete.test b/tests/obsolete.test
index 442b24716ca37a6bc655792b255d440876bd0100..306cf1356b3fd11ddcef02a1bd4b6b10f4e6788b 100755 (executable)
--- a/tests/obsolete.test
+++ b/tests/obsolete.test
@@ -13,5 +13,6 @@ END
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/obsolete2.test b/tests/obsolete2.test
index 6ea8ff8c34cc040c03924ea59badc0312002f04f..4a65e8461946e62e95519302f4031f7a90029363 100755 (executable)
--- a/tests/obsolete2.test
+++ b/tests/obsolete2.test
@@ -8,6 +8,7 @@ echo AM_FUNC_FNMATCH >> configure.in
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE 2> output && exit 1
 
 grep AC_FUNC_FNMATCH output

diff --git a/tests/outdir.test b/tests/outdir.test
index c9055684f08573f658f2c1f7dd9536765bc1592b..f3da316353913e1b6a22eb9084d73a1ccb71ea90 100755 (executable)
--- a/tests/outdir.test
+++ b/tests/outdir.test
@@ -11,6 +11,7 @@ END
 
 mkdir zardir
 
+$ACLOCAL || exit 1
 $AUTOMAKE --output-dir=zardir || exit 1
 
 test -f Makefile.in && exit 1

diff --git a/tests/output.test b/tests/output.test
index 9f23c67dc8c1584d7301856aff830344ae9ed099..b2b8c8cee7164ab0768eb3c0cfcabfcdec43255d 100755 (executable)
--- a/tests/output.test
+++ b/tests/output.test
@@ -17,4 +17,5 @@ END
 mkdir frob
 : > frob/zardoz.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/output2.test b/tests/output2.test
index 7aed3fea7a9f87204e4b73de934b29a1d0e40c97..086b97448cf1b5f0cb5096b2d50036f563987b17 100755 (executable)
--- a/tests/output2.test
+++ b/tests/output2.test
@@ -19,6 +19,7 @@ mkdir intl po misc
 : > po/Makefile.in.am
 : > misc/gettextize.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^gettextize' Makefile.in && exit 1

diff --git a/tests/output3.test b/tests/output3.test
index 139ee5f3bc8766181bf92ba4ba66b198cd4c4528..f9e01a5e2dc6577674e720dac749945a5da84bb5 100755 (executable)
--- a/tests/output3.test
+++ b/tests/output3.test
@@ -20,4 +20,5 @@ mkdir tests
 : > tests/Makefile.am
 : > tests/defs.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/output4.test b/tests/output4.test
index 3ee08deb9774adbbebfadab36a87191ba340b381..46695c63f9d0b321110156b96733390fbec3084b 100755 (executable)
--- a/tests/output4.test
+++ b/tests/output4.test
@@ -16,6 +16,7 @@ mkdir tests
 : > tests/defs.in
 : > tests/Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep tests/defs.in tests/Makefile.in && exit 1

diff --git a/tests/output5.test b/tests/output5.test
index 2052716cd07d16da572695e7cb9a71d6ba67d6b5..e354db0ea54802bd35eb88c4b5aea21191427f80 100755 (executable)
--- a/tests/output5.test
+++ b/tests/output5.test
@@ -12,6 +12,7 @@ END
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE > output 2>&1 && exit 1
 grep 'found or specified' output && exit 1
 exit 0

diff --git a/tests/package.test b/tests/package.test
index 0d14b06709e2509787808092cd6c358975508c94..9eb4e17d863089c8362a1fd73a22d4b527605e10 100755 (executable)
--- a/tests/package.test
+++ b/tests/package.test
@@ -12,5 +12,6 @@ cat > Makefile.am << 'END'
 pkgdata_DATA =
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/pluseq.test b/tests/pluseq.test
index 165f4e2e4cd6d4f234982944e50779912044f744..f7673a4731c2ff6b2168663ddd865aa2f51ddecd 100755 (executable)
--- a/tests/pluseq.test
+++ b/tests/pluseq.test
@@ -12,5 +12,6 @@ END
 : > zar
 : > doz
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 fgrep 'zar doz' Makefile.in

diff --git a/tests/pluseq2.test b/tests/pluseq2.test
index 9be0a5e5b98ad40b8925ca95ab816eace285bfdd..be1e0705551cd8dd4e22d48a851d9e89164038c8 100755 (executable)
--- a/tests/pluseq2.test
+++ b/tests/pluseq2.test
@@ -24,6 +24,7 @@ END
 : > doz
 : > dog
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 grep 'CHECK_TRUE.*zar doz' Makefile.in || exit 1
 grep 'CHECK_FALSE.*dog' Makefile.in

diff --git a/tests/pluseq3.test b/tests/pluseq3.test
index 71d4ccf90738722ec153e84c51699e6e90e7d11d..58555a6ea99f0b1a1a9de04dd8aa41e45a4fe829 100755 (executable)
--- a/tests/pluseq3.test
+++ b/tests/pluseq3.test
@@ -27,6 +27,7 @@ END
 
 set -e
 
+$ACLOCAL || exit 1
 $AUTOMAKE
 
 grep '^@CHECK_TRUE@data_DATA = zar \\$' Makefile.in

diff --git a/tests/pluseq5.test b/tests/pluseq5.test
index b5700b514b2d28f80ad60dc0f425b7736accb733..e1d4903d01f849d82fcbd1121c2388758b2133f1 100755 (executable)
--- a/tests/pluseq5.test
+++ b/tests/pluseq5.test
@@ -13,5 +13,6 @@ endif
 INCLUDES += def
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 0
 exit 1

diff --git a/tests/pluseq6.test b/tests/pluseq6.test
index cf4a36a0a4822d4864ccd6ac573079775360f183..ae8e869abbc4bf23f6046f3dfb8b3ce0a071c6d5 100755 (executable)
--- a/tests/pluseq6.test
+++ b/tests/pluseq6.test
@@ -12,6 +12,7 @@ mandir += foo
 zq = zzz
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 fgrep '@mandir@ foo' Makefile.in || exit 1
 

diff --git a/tests/pluseq8.test b/tests/pluseq8.test
index bd974bb6be8f8e534ffa59f79f240f81ae4e982e..6cc60d5d0a1af6108e3b4b7725690121eb226c93 100755 (executable)
--- a/tests/pluseq8.test
+++ b/tests/pluseq8.test
@@ -11,6 +11,7 @@ VAR = \
 VAR += three
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 sed -n -e '/^VAR =.*\\$/ {

diff --git a/tests/ppf77.test b/tests/ppf77.test
index 7aca16d1a565aabface697a5c5c65e758661aee4..68466a757164837ee8d882713fe01a4cf87b7058 100755 (executable)
--- a/tests/ppf77.test
+++ b/tests/ppf77.test
@@ -17,4 +17,5 @@ END
 : > foo.F
 : > q.r
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/pr2.test b/tests/pr2.test
index a03caba1a25e776ffbea80055ce8be13541b8cfb..7f8b00c5d7c6ddfd5d91defeec4df584e0ce42ff 100755 (executable)
--- a/tests/pr2.test
+++ b/tests/pr2.test
@@ -17,6 +17,7 @@ END
 mkdir templ
 : > templ/README.foo.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 # Look for mkinstalldirs invocation for the templ directory.

diff --git a/tests/primary.test b/tests/primary.test
index 3a561b7df9edc21b731ae3ae1ddbff4c8e1f8a2e..4cbe94340ff85d53cb270a15468f195375984798 100755 (executable)
--- a/tests/primary.test
+++ b/tests/primary.test
@@ -8,5 +8,6 @@ cat > Makefile.am << 'END'
 bin_PROGRAMS = @programs@
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/proginst.test b/tests/proginst.test
index 1a3d1064db8c30af37dc0f5293b9d8aad1491713..5de275f32c336d117875b8dcc53d06a1c4b84f22 100755 (executable)
--- a/tests/proginst.test
+++ b/tests/proginst.test
@@ -9,4 +9,5 @@ cat > Makefile.am << 'END'
 bin_SCRIPTS = zardoz qbert brownie
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/python.test b/tests/python.test
index b3b52b9c7d0a7f985829ff6a7943281ded47e2fa..9d06d22c3a97eed2f51810c3ee79fc32685339cf 100755 (executable)
--- a/tests/python.test
+++ b/tests/python.test
@@ -10,6 +10,7 @@ cat > Makefile.am << 'END'
 python_PYTHON = foo.py
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE -a || exit 1
 
 grep '^py_compile =' Makefile.in

diff --git a/tests/remake.test b/tests/remake.test
index 3dd7a8e00402f21fa73d573b316aa776923a0427..eed132b8ab1b1d4e48eb9f02e44419904496377c 100755 (executable)
--- a/tests/remake.test
+++ b/tests/remake.test
@@ -15,6 +15,7 @@ END
 mkdir sub
 : > sub/Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^Makefile' sub/Makefile.in

diff --git a/tests/remake2.test b/tests/remake2.test
index d153188c34b4c77bc17cfc0fdc89d4b8e5b4698e..b57d41e5dfee3b4c6b97ea09acee1089e6acef39 100755 (executable)
--- a/tests/remake2.test
+++ b/tests/remake2.test
@@ -15,6 +15,7 @@ END
 mkdir sub
 : > sub/Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep 'AUTOMAKE.*sub/Makefile' sub/Makefile.in

diff --git a/tests/remake3.test b/tests/remake3.test
index b898aad7c85eb37aaa2405c560f75771b673ed25..f3b08fd8d60780f2edcb537b865c23c5d2cb4a47 100755 (executable)
--- a/tests/remake3.test
+++ b/tests/remake3.test
@@ -17,6 +17,7 @@ END
 mkdir sub
 : > sub/foo.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^sub/foo' Makefile.in

diff --git a/tests/rulepat.test b/tests/rulepat.test
index 1a1544ceae518af7f82daf7dd86ef68d72b1617c..87cdbd59cd92d09c3eb3cd08e330be1aad32aa8b 100755 (executable)
--- a/tests/rulepat.test
+++ b/tests/rulepat.test
@@ -8,6 +8,7 @@ cat > Makefile.am << 'END'
 $(srcdir)/Makefile.am:
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^$(srcdir)/Makefile\.am' Makefile.in

diff --git a/tests/scripts.test b/tests/scripts.test
index 995b78cd0212399110eada1e1f4b647e26c21b75..02052b6d2351e02c7148e35c3265e9a0fe477a4d 100755 (executable)
--- a/tests/scripts.test
+++ b/tests/scripts.test
@@ -17,4 +17,5 @@ cat > Makefile.am << 'END'
 noinst_SCRIPTS = foo
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/seenc.test b/tests/seenc.test
index 87bfc548496c870f609d7eb4d010fda00ad8aa96..16ce89f82112be5a4fab1ced6421d28d4afb01d8 100755 (executable)
--- a/tests/seenc.test
+++ b/tests/seenc.test
@@ -17,5 +17,6 @@ END
 : > fsusage.c
 : > mountlist.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE > out 2>&1 && exit 1
 exit 0

diff --git a/tests/sinclude.test b/tests/sinclude.test
index 96dd30dcd0416ed1c9277d610d3635d13cbb446f..684e1fb89fb3e61e090b05797782a7f0bf370a58 100755 (executable)
--- a/tests/sinclude.test
+++ b/tests/sinclude.test
@@ -15,6 +15,7 @@ END
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE --Wno-error || exit 1
 
 grep MAGICALPIG Makefile.in

diff --git a/tests/spell.test b/tests/spell.test
index 493612cb02663ce571e5d89a01759057e61e6e7b..1c4cc049028de7e7a6ee9eb169d5190710973b76 100755 (executable)
--- a/tests/spell.test
+++ b/tests/spell.test
@@ -10,5 +10,6 @@ zardoz_SOURCES = x.c
 boo_SOURCES = y.c
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/spell3.test b/tests/spell3.test
index 0f3571e46534e6a01ed28ba94e4e6d463e071557..3dc3d1bf2cd557d87fe014bc5a2d8fda34c6fd05 100755 (executable)
--- a/tests/spell3.test
+++ b/tests/spell3.test
@@ -11,4 +11,5 @@ TAGS_DEPENDENCIES = joe
 ETAGS_ARGS = joe
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/spelling.test b/tests/spelling.test
index b0cf2033b5fa9146c812645dbf24b93d76c1ee4d..4e6c5a03b7a58138e1d58be0c8c1f7f70e9fee9e 100755 (executable)
--- a/tests/spelling.test
+++ b/tests/spelling.test
@@ -8,7 +8,8 @@ cat > Makefile.am << 'EOF'
 bni_PROGRAMS = zot
 EOF
 
-if $AUTOMAKE; then
+if $ACLOCAL || exit 1
+$AUTOMAKE; then
    exit 1
 fi
 exit 0

diff --git a/tests/stamph.test b/tests/stamph.test
index f7ff20f2feff029bbb70ed9c7970fe20689bf7fe..0c14c0280b6444ff89584de4315ca7f86065b283 100755 (executable)
--- a/tests/stamph.test
+++ b/tests/stamph.test
@@ -12,5 +12,6 @@ END
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/subdir.test b/tests/subdir.test
index 3373810f2eae8747032636a26c7f48ff267e82eb..93652442f83c8e05ea0158b698d573eeeab68db2 100755 (executable)
--- a/tests/subdir.test
+++ b/tests/subdir.test
@@ -23,4 +23,5 @@ cat > zot/Makefile.am << 'END'
 pkgdata_DATA =
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/subdir2.test b/tests/subdir2.test
index 4d9c8244d3a6ecf3ab14396fa626ccf8a45ed96f..50876cf70aa9aa2c23a2556eb1db4af95e0467fd 100755 (executable)
--- a/tests/subdir2.test
+++ b/tests/subdir2.test
@@ -35,4 +35,5 @@ cat > one/two/Makefile.am << 'END'
 pkgdata_DATA =
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE --gnu

diff --git a/tests/subdircond.test b/tests/subdircond.test
index 25bb5e84e273f387519076cde8aca45086e83858..fcdd11dfa3920a713c80d799c34be9f978bd54bc 100755 (executable)
--- a/tests/subdircond.test
+++ b/tests/subdircond.test
@@ -21,4 +21,5 @@ SUBDIRS =
 endif
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/subst.test b/tests/subst.test
index 42098ecbbd262c874cbec924149a445f1ae901ea..e9b746bcf88cbc9a7451fcc80206e33f135285d9 100755 (executable)
--- a/tests/subst.test
+++ b/tests/subst.test
@@ -12,6 +12,7 @@ END
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 grep '^\$1' Makefile.in && exit 1
 exit 0

diff --git a/tests/symlink.test b/tests/symlink.test
index 789351311bd8a37860a1129f736ebb07af16494a..9312fb3105abfaa503e505041ef73f4bdb7de150 100755 (executable)
--- a/tests/symlink.test
+++ b/tests/symlink.test
@@ -14,5 +14,6 @@ cat >> configure.in << 'END'
 AC_CONFIG_AUX_DIR(sub)
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE --add-missing && exit 1
 exit 0

diff --git a/tests/symlink2.test b/tests/symlink2.test
index a83d957bc5834ef80cbd28eb61a674a2b708a18d..960e4ca899330a3211efa650b5245134ed3f65d2 100755 (executable)
--- a/tests/symlink2.test
+++ b/tests/symlink2.test
@@ -10,4 +10,5 @@ ln -s Zardoz mkinstalldirs
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE --add-missing

diff --git a/tests/symlink3.test b/tests/symlink3.test
index 40d7ebc0815db9e3c9ba3d95aebb1c547c1713c2..807b293a384730a412f1f715d2e8c6bec880f227 100755 (executable)
--- a/tests/symlink3.test
+++ b/tests/symlink3.test
@@ -12,6 +12,7 @@ echo zot > mkinstalldirs
 
 : > Makefile.am
 
+$ACLOCAL || exit 1
 $AUTOMAKE --add-missing --force-missing || exit 1
 
 grep zot mkinstalldirs && exit 1

diff --git a/tests/syntax.test b/tests/syntax.test
index 8ca03920dcbb2f52867fc7fce5e6319c27f3a4d7..f06ad1da94719f0c9f66ab4ae2a7aa61cff513b4 100755 (executable)
--- a/tests/syntax.test
+++ b/tests/syntax.test
@@ -10,5 +10,6 @@ foo = q \
 lib_LTLIBRARIES = foo.la
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/tags.test b/tests/tags.test
index ca6a29fb11e790162b6fb71e4d697ffea2f22380..9d9c125f1eae580437f19eb01294f8a1827fe199 100755 (executable)
--- a/tests/tags.test
+++ b/tests/tags.test
@@ -11,6 +11,7 @@ END
 
 : > iguana.h
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^ID:' Makefile.in

diff --git a/tests/tagsub.test b/tests/tagsub.test
index 9f766f38f23540bb089f53c742d883b7b70941ad..174774edc35baaf44bbdde9dfd96a23fab94f94a 100755 (executable)
--- a/tests/tagsub.test
+++ b/tests/tagsub.test
@@ -25,6 +25,7 @@ VERSION=nonesuch
 AC_OUTPUT(Makefile sub/Makefile)
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^TAGS:.*tags-recursive' Makefile.in

diff --git a/tests/texinfo.test b/tests/texinfo.test
index 77b1538f647b489ed731b251c15c54842a5f25f4..3ade532305ddf799866be24cba998f2924945413 100755 (executable)
--- a/tests/texinfo.test
+++ b/tests/texinfo.test
@@ -14,6 +14,7 @@ END
 echo '@setfilename textutils.info' > textutils.texi
 : > texinfo.tex
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed

diff --git a/tests/texinfo10.test b/tests/texinfo10.test
index f93edbce6cce7d09abe5355342b631c9f3420da7..d6a170165b5c774484efa8dd8d6f33a11d848346 100755 (executable)
--- a/tests/texinfo10.test
+++ b/tests/texinfo10.test
@@ -17,6 +17,7 @@ END
 echo '@setfilename maude.info' > sub/maude.texi
 : > sub/texinfo.tex
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep dvi-recursive Makefile.in

diff --git a/tests/texinfo2.test b/tests/texinfo2.test
index a7d9a3cd070530a5cdc6bf63d79ca2cefcfd0066..8e0d95ab11fd5fd959a527ce6c9571709df1890f 100755 (executable)
--- a/tests/texinfo2.test
+++ b/tests/texinfo2.test
@@ -15,6 +15,7 @@ END
 echo '@setfilename textutils.info' > textutils.texi
 : > textutils.info~
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 test -z "`$MAKE -s -f Makefile.in magic | grep '~'`"

diff --git a/tests/texinfo3.test b/tests/texinfo3.test
index e5ae269546068a4099dc5b6556c2b6d2eb157178..ce6c68ea9be8ce18f7bff73217053ded9d1a7908 100755 (executable)
--- a/tests/texinfo3.test
+++ b/tests/texinfo3.test
@@ -11,6 +11,7 @@ END
 echo '@setfilename textutils' > textutils.texi
 : > texinfo.tex
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^INFO_DEPS.*textutils$' Makefile.in

diff --git a/tests/texinfo4.test b/tests/texinfo4.test
index 17b76e570bba65846a12bc6ab2bd191e5d0a9bb2..0c2cf9027efe18bc02404363995902852bb0044f 100755 (executable)
--- a/tests/texinfo4.test
+++ b/tests/texinfo4.test
@@ -11,5 +11,6 @@ END
 echo '@setfilename textutils.frob' > textutils.texi
 : > texinfo.tex
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/texinfo5.test b/tests/texinfo5.test
index 0548709076b7dddc76bdc1c4884cd07d73c8912e..7129fe68ba1c13d4ce53174ee4625a0b2c32545e 100755 (executable)
--- a/tests/texinfo5.test
+++ b/tests/texinfo5.test
@@ -15,4 +15,5 @@ END
 
 echo '@setfilename ian.info' > ian.texi
 
+$ACLOCAL || exit 1
 $AUTOMAKE --cygnus

diff --git a/tests/texinfo6.test b/tests/texinfo6.test
index dd984f824aff39ac5f7dae3ac659e8e60a5f4114..6df7556290e4acb0cc3457c77704fffbe2525390 100755 (executable)
--- a/tests/texinfo6.test
+++ b/tests/texinfo6.test
@@ -10,6 +10,7 @@ END
 echo '@setfilename foo.info' > foo.txi
 : > texinfo.tex
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep '.txi.info' Makefile.in

diff --git a/tests/texinfo7.test b/tests/texinfo7.test
index b98121312df97b9a914cb06912cde8c03c527a4e..c43520294c2e7de1c479af2b26eda7fd517fdc17 100755 (executable)
--- a/tests/texinfo7.test
+++ b/tests/texinfo7.test
@@ -13,6 +13,7 @@ END
 
 echo '@setfilename textutils.info' > textutils.texi
 
+$ACLOCAL || exit 1
 $AUTOMAKE -a || exit 1
 
 test -f texinfo.tex

diff --git a/tests/texinfo8.test b/tests/texinfo8.test
index 7527ebcc6913bb31c87a94aa207d010848ecdf4b..5430b6e0ddb3043f6f256dc75498a4245777031b 100755 (executable)
--- a/tests/texinfo8.test
+++ b/tests/texinfo8.test
@@ -28,6 +28,7 @@ magic:
        @echo $(DISTFILES)
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE -a || exit 1
 
 fgrep -v @SET_MAKE@ sub/Makefile.in > sub/Makefile.sed

diff --git a/tests/texinfo9.test b/tests/texinfo9.test
index 5ae8c065aaa11b2559b324b67ec4a94eb0e51ba7..4f0666ce1c55584eb658ec2845d5e47efd9734da 100755 (executable)
--- a/tests/texinfo9.test
+++ b/tests/texinfo9.test
@@ -15,6 +15,7 @@ echo '@setfilename liver.info' > liver.txi
 echo '@setfilename heart.info' > heart.texinfo
 : > texinfo.tex
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 test `grep '^dist-info:' Makefile.in | wc -l` -eq 1

diff --git a/tests/vars.test b/tests/vars.test
index 2f71a49f36d23a1fcceec10aae23e4f359cce07f..50c9f462a117ebea64a2268890eaedf4cfc95121 100755 (executable)
--- a/tests/vars.test
+++ b/tests/vars.test
@@ -12,4 +12,5 @@ MY_FLAGS_3 =-DABC=345
 MY_FLAGS_4 = -DABC=345
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/vartar.test b/tests/vartar.test
index 578dbd046867a53b1b989a55b50c3f32943fad35..8a212066c897c6c184f6a9f6eb78c147da208438 100755 (executable)
--- a/tests/vartar.test
+++ b/tests/vartar.test
@@ -10,6 +10,7 @@ install:
        $(install) install
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^install = install$' Makefile.in || exit 1

diff --git a/tests/version.test b/tests/version.test
index a5241a039a57e161ad0d15a732e57cae13b3e1a6..a9265271ea050608edc7a0b156d723bda730f097 100755 (executable)
--- a/tests/version.test
+++ b/tests/version.test
@@ -22,4 +22,5 @@ END
 : > ChangeLog
 : > THANKS
 
+$ACLOCAL || exit 1
 $AUTOMAKE --gnits

diff --git a/tests/version2.test b/tests/version2.test
index cbf4e7582bd9ab744947c4df1afab7c5e95327a4..6acc27309df4371c4bacdc88984b230243cb3bb0 100755 (executable)
--- a/tests/version2.test
+++ b/tests/version2.test
@@ -22,4 +22,5 @@ END
 : > ChangeLog
 : > THANKS
 
+$ACLOCAL || exit 1
 $AUTOMAKE --gnits

diff --git a/tests/version3.test b/tests/version3.test
index 00fdcfb4be9bb5575484efba471943fd5b65e5b0..c9461eba6a4334b645d831c4daefcba0768acdf5 100755 (executable)
--- a/tests/version3.test
+++ b/tests/version3.test
@@ -8,5 +8,6 @@ cat > Makefile.am << 'END'
 AUTOMAKE_OPTIONS = 9.9x
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/version4.test b/tests/version4.test
index 9744b5904c8c377cc978b021820495d2f4bcd2af..993bc5c0a3e260373067dc3f9d04f088c835ff53 100755 (executable)
--- a/tests/version4.test
+++ b/tests/version4.test
@@ -8,4 +8,5 @@ cat > Makefile.am << 'END'
 AUTOMAKE_OPTIONS = 1.4-p3
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/vpath.test b/tests/vpath.test
index 03bbc09299a0b9a7381b7cd044fa3c7b93b029b4..89e5004cb608efdb21cd7aadadb5624a9645e5e0 100755 (executable)
--- a/tests/vpath.test
+++ b/tests/vpath.test
@@ -9,6 +9,7 @@ cat > Makefile.am << 'END'
 VPATH = zardoz
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep 'VPATH.*@srcdir@' Makefile.in && exit 1

diff --git a/tests/vtexi.test b/tests/vtexi.test
index afe5f8dd8de220d31bfe3a9edd69fec80e135c05..b996360979d8f3a29277dfc812582f3cdb2529aa 100755 (executable)
--- a/tests/vtexi.test
+++ b/tests/vtexi.test
@@ -17,6 +17,7 @@ END
 
 set -e
 
+$ACLOCAL || exit 1
 $AUTOMAKE
 
 # Test for bug reported by Jim Meyering:

diff --git a/tests/vtexi2.test b/tests/vtexi2.test
index d950c258c3df52ba88dfee01eb9d869eb94e4b02..7587f31ee436c14dce4f0ef1170ea328d38eb67d 100755 (executable)
--- a/tests/vtexi2.test
+++ b/tests/vtexi2.test
@@ -20,6 +20,7 @@ END
 : > mdate-sh
 : > texinfo.tex
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^zardoz\.dvi:' Makefile.in

diff --git a/tests/werror.test b/tests/werror.test
index 23ce2ae521f72b04f90a1c75666e9bd7aed986d1..6bfb1389e6f9811261d05be16013047fc4daba38 100755 (executable)
--- a/tests/werror.test
+++ b/tests/werror.test
@@ -8,4 +8,5 @@
 
 rm -f install-sh depcomp missing mkinstalldirs
 
+$ACLOCAL || exit 1
 $AUTOMAKE --Werror --add-missing