Use AM_CONDITIONAL and if/endif for AMDEP.

* m4/depend.m4 (AM_DEP_TRACK): Use AM_CONDITIONAL to define AMDEP.
* automake.in (&add_depend2): Transform %AMDEP% into `AMDEP' (leading
to a configure time if/endif), or to `FALSE' (static removal of
the code).
(&handle_dependencies): Adjust to use `AMDEP_TRUE'.
* depend2.am: Use if/endif.
Adjust the 101 tests that use dependencies so that they
properly invoke aclocal before automake.  They need to `see'
`AM_CONDITIONAL([AMDEP], ...)'.

diff --git a/ChangeLog b/ChangeLog
index db8fba3bf524875e9cd7850dcd7bebe51b450c96..764116022f41f2469fb303a2064221cc8134289e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2001-04-09  Akim Demaille  <akim@epita.fr>
+
+       Use AM_CONDITIONAL and if/endif for AMDEP.
+
+       * m4/depend.m4 (AM_DEP_TRACK): Use AM_CONDITIONAL to define AMDEP.
+       * automake.in (&add_depend2): Transform %AMDEP% into `AMDEP' (leading
+       to a configure time if/endif), or to `FALSE' (static removal of
+       the code).
+       (&handle_dependencies): Adjust to use `AMDEP_TRUE'.
+       * depend2.am: Use if/endif.
+
+       Adjust the 101 tests that use dependencies so that they
+       properly invoke aclocal before automake.  They need to `see'
+       `AM_CONDITIONAL([AMDEP], ...)'.
+
 2001-04-09  Akim Demaille  <akim@epita.fr>
 
        * tags.am: Fix missing leading tabs.

diff --git a/automake.in b/automake.in
index c42103abc384695e185dd14a3445e02d089674c3..9f8bac9ca57d87733d7647e96b4fa8243a81ed66 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3043,7 +3043,7 @@ sub add_depend2
     my %transform = ('PFX'  => $pfx,
                     'FPFX' => $fpfx,
                     'LIBTOOL' => $seen_libtool,
-                    'AMDEP'   => $use_dependencies);
+                    'AMDEP'   => $use_dependencies ? 'AMDEP' : 'FALSE');
 
     # This function can be called even when we don't want dependency
     # tracking.  This happens when we need an explicit rule for some
@@ -3139,7 +3139,7 @@ sub handle_dependencies
            # We define this as a conditional variable because BSD
            # make can't handle backslashes for continuing comments on
            # the following line.
-           &define_pretty_variable ('DEP_FILES', 'AMDEP', @deplist);
+           &define_pretty_variable ('DEP_FILES', 'AMDEP_TRUE', @deplist);
 
            # Generate each `include' individually.  Irix 6 make will
            # not properly include several files resulting from a
@@ -3148,7 +3148,7 @@ sub handle_dependencies
            $output_rules .= "\n";
            foreach my $iter (@deplist)
            {
-               $output_rules .= "\@AMDEP\@\@_am_include\@ " . $iter . "\n";
+               $output_rules .= '@AMDEP_TRUE@@_am_include@ ' . $iter . "\n";
            }
 
            $output_rules .= &file_contents ('depend');

diff --git a/depend2.am b/depend2.am
index 285adf6090a4ed78ccbb08567974a7e431261846..421e225bfc7e596f387b6563e6c5f41424e06710 100644 (file)
--- a/depend2.am
+++ b/depend2.am
@@ -21,25 +21,38 @@
 ## - once per language for generic compilation rules
 ## - once for each file which requires specific flags.
 
-?GENERIC??AMDEP?@AMDEP@%FPFX%DEPMODE = @%FPFX%DEPMODE@
+## Note it is on purpose we wrote `if %AMDEP%', since %AMDEP% becomes
+## '@AMDEP_TRUE@' if dependencies are to be used, otherwise FALSE.
+
+if %AMDEP%
+?GENERIC?%FPFX%DEPMODE = @%FPFX%DEPMODE@
+endif %AMDEP%
 
 ?GENERIC?%EXT%.o:
 ?!GENERIC?%OBJ%: %SOURCE%
-?AMDEP?@AMDEP@ source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
-?AMDEP?@AMDEP@ depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' @AMDEPBACKSLASH@
-?AMDEP?@AMDEP@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+if %AMDEP%
+       source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
+       depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' @AMDEPBACKSLASH@
+       $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif %AMDEP%
        %COMPILE% -c -o %OBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
 
-?LIBTOOL??GENERIC?%EXT%.lo:
-?LIBTOOL??!GENERIC?%LTOBJ%: %SOURCE%
-?LIBTOOL??AMDEP?@AMDEP@        source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
-?LIBTOOL??AMDEP?@AMDEP@        depfile='$(DEPDIR)/%BASE%.Plo' tmpdepfile='$(DEPDIR)/%BASE%.TPlo' @AMDEPBACKSLASH@
-?LIBTOOL??AMDEP?@AMDEP@        $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
-?LIBTOOL?      %LTCOMPILE% -c -o %LTOBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
+if %?LIBTOOL?%
+?GENERIC?%EXT%.lo:
+?!GENERIC?%LTOBJ%: %SOURCE%
+if  %AMDEP%
+       source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
+       depfile='$(DEPDIR)/%BASE%.Plo' tmpdepfile='$(DEPDIR)/%BASE%.TPlo' @AMDEPBACKSLASH@
+       $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif  %AMDEP%
+       %LTCOMPILE% -c -o %LTOBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
+endif %?LIBTOOL?%
 
 ?GENERIC?%EXT%.obj:
 ?!GENERIC?%OBJOBJ%: %SOURCE%
-?AMDEP?@AMDEP@ source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
-?AMDEP?@AMDEP@ depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' @AMDEPBACKSLASH@
-?AMDEP?@AMDEP@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+if %AMDEP%
+       source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
+       depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' @AMDEPBACKSLASH@
+       $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif %AMDEP%
        %COMPILE% -c -o %OBJOBJ% `cygpath -w %SOURCE%`

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 285adf6090a4ed78ccbb08567974a7e431261846..421e225bfc7e596f387b6563e6c5f41424e06710 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -21,25 +21,38 @@
 ## - once per language for generic compilation rules
 ## - once for each file which requires specific flags.
 
-?GENERIC??AMDEP?@AMDEP@%FPFX%DEPMODE = @%FPFX%DEPMODE@
+## Note it is on purpose we wrote `if %AMDEP%', since %AMDEP% becomes
+## '@AMDEP_TRUE@' if dependencies are to be used, otherwise FALSE.
+
+if %AMDEP%
+?GENERIC?%FPFX%DEPMODE = @%FPFX%DEPMODE@
+endif %AMDEP%
 
 ?GENERIC?%EXT%.o:
 ?!GENERIC?%OBJ%: %SOURCE%
-?AMDEP?@AMDEP@ source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
-?AMDEP?@AMDEP@ depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' @AMDEPBACKSLASH@
-?AMDEP?@AMDEP@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+if %AMDEP%
+       source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
+       depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' @AMDEPBACKSLASH@
+       $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif %AMDEP%
        %COMPILE% -c -o %OBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
 
-?LIBTOOL??GENERIC?%EXT%.lo:
-?LIBTOOL??!GENERIC?%LTOBJ%: %SOURCE%
-?LIBTOOL??AMDEP?@AMDEP@        source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
-?LIBTOOL??AMDEP?@AMDEP@        depfile='$(DEPDIR)/%BASE%.Plo' tmpdepfile='$(DEPDIR)/%BASE%.TPlo' @AMDEPBACKSLASH@
-?LIBTOOL??AMDEP?@AMDEP@        $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
-?LIBTOOL?      %LTCOMPILE% -c -o %LTOBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
+if %?LIBTOOL?%
+?GENERIC?%EXT%.lo:
+?!GENERIC?%LTOBJ%: %SOURCE%
+if  %AMDEP%
+       source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
+       depfile='$(DEPDIR)/%BASE%.Plo' tmpdepfile='$(DEPDIR)/%BASE%.TPlo' @AMDEPBACKSLASH@
+       $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif  %AMDEP%
+       %LTCOMPILE% -c -o %LTOBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
+endif %?LIBTOOL?%
 
 ?GENERIC?%EXT%.obj:
 ?!GENERIC?%OBJOBJ%: %SOURCE%
-?AMDEP?@AMDEP@ source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
-?AMDEP?@AMDEP@ depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' @AMDEPBACKSLASH@
-?AMDEP?@AMDEP@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+if %AMDEP%
+       source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
+       depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' @AMDEPBACKSLASH@
+       $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif %AMDEP%
        %COMPILE% -c -o %OBJOBJ% `cygpath -w %SOURCE%`

diff --git a/m4/depend.m4 b/m4/depend.m4
index 59c95d655245935f9e6e05c656434473e11a9093..cb73080a46a4d91033f6af0aa3dc8a8599b884b4 100644 (file)
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -111,22 +111,11 @@ AC_DEFUN([AM_DEP_TRACK],
 [AC_ARG_ENABLE(dependency-tracking,
 [  --disable-dependency-tracking Speeds up one-time builds
   --enable-dependency-tracking  Do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" = xno; then
-  AMDEP="#"
-else
+if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
-  if test ! -f "$am_depcomp"; then
-    AMDEP="#"
-  else
-    AMDEP=
-  fi
-fi
-AC_SUBST(AMDEP)
-if test -z "$AMDEP"; then
   AMDEPBACKSLASH='\'
-else
-  AMDEPBACKSLASH=
 fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 pushdef([subst], defn([AC_SUBST]))
 subst(AMDEPBACKSLASH)
 popdef([subst])

diff --git a/tests/ansi2.test b/tests/ansi2.test
index 9f51f8e90e3596da6138633931869e2a969ae931..04368131f921dbaa31ed5422c766b4e4e6e05167 100755 (executable)
--- a/tests/ansi2.test
+++ b/tests/ansi2.test
@@ -17,6 +17,7 @@ END
 : > ansi2knr.c
 : > ansi2knr.1
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^all[-a-z]*:.*ANSI2KNR' Makefile.in

diff --git a/tests/ansi4.test b/tests/ansi4.test
index 4775ad339125ad00ce939fd7cff9d0b7ae59cd61..ac03bbf560c0b8f9256ae27907db45ab97c954d3 100755 (executable)
--- a/tests/ansi4.test
+++ b/tests/ansi4.test
@@ -21,6 +21,7 @@ END
 : > ansi2knr.c
 : > hello.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep 'ansi2knr.$(' Makefile.in || exit 1

diff --git a/tests/backsl.test b/tests/backsl.test
index a35c5d143eb5f40172e30d91e4f00fd6efaa7f9b..0bf43a66fe9f57cc0a9e7f8689d086d805902ff2 100755 (executable)
--- a/tests/backsl.test
+++ b/tests/backsl.test
@@ -13,6 +13,7 @@ bin_PROGRAMS = \
    frob
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^_SOURCE' Makefile.in && exit 1

diff --git a/tests/badprog.test b/tests/badprog.test
index 91876a7d78caae88ea6d8fdff0f72a296ea93eb7..47711e7627ac1f4d9fbdc2c03652eef540e7e985 100755 (executable)
--- a/tests/badprog.test
+++ b/tests/badprog.test
@@ -14,4 +14,5 @@ bin_PROGRAMS = a,b
 a_b_SOURCES = ab.c
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/canon.test b/tests/canon.test
index b54caf325ee50f040a64399eaa5d647246476104..6745c7da7b98872c13eb6e639ce66c253561c27c 100755 (executable)
--- a/tests/canon.test
+++ b/tests/canon.test
@@ -11,5 +11,6 @@ bin_PROGRAMS = sniff-glue
 sniff-glue_SOURCES = sg.c
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/canon3.test b/tests/canon3.test
index d7a28a712d5a8874b870aecc551f1af76e450749..f6e70fdcf56e7f7dff0e9e8a888887256006d873 100755 (executable)
--- a/tests/canon3.test
+++ b/tests/canon3.test
@@ -14,6 +14,7 @@ END
 
 : > perm-number.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep 'perm_number\.c' Makefile.in && exit 1

diff --git a/tests/canon4.test b/tests/canon4.test
index 5ca51e7b5e19a8f228b812748d02f076448fd6ea..330ead00673b1004c1a437710355a2cae806d2c5 100755 (executable)
--- a/tests/canon4.test
+++ b/tests/canon4.test
@@ -14,6 +14,7 @@ noinst_LIBRARIES = libx-y.a
 libx_y_a_SOURCES = xy.c
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^libx-y.*=' Makefile.in && exit 1

diff --git a/tests/canon5.test b/tests/canon5.test
index 9162f99199fc5a1131f493410021fde917d77b09..b05ced44589bbba09988d8eb02b57c8d40a248f3 100755 (executable)
--- a/tests/canon5.test
+++ b/tests/canon5.test
@@ -12,6 +12,7 @@ bin_PROGRAMS = 123test
 123test_SOURCES = 123.c
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 cat > Makefile.am << 'END'

diff --git a/tests/comment2.test b/tests/comment2.test
index d25a19a9ef0808917c6c7c53dce433e17af6e5d6..c2a1d2c1b2124de07c75a6835851a1a1d2ea782b 100755 (executable)
--- a/tests/comment2.test
+++ b/tests/comment2.test
@@ -13,6 +13,7 @@ cat > Makefile.am << 'END'
 bin_PROGRAMS = sim_products receive_th receive_pos # image_proc
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^image_proc' Makefile.in && exit 1

diff --git a/tests/compile_f_c_cxx.test b/tests/compile_f_c_cxx.test
index 2ef19dcd53a753806a450ec775fc34f2b5253019..8aa089531e50e046feea54657c68347d4a6878f5 100755 (executable)
--- a/tests/compile_f_c_cxx.test
+++ b/tests/compile_f_c_cxx.test
@@ -23,6 +23,7 @@ END
 : > bar.c
 : > baz.cc
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 

diff --git a/tests/cond3.test b/tests/cond3.test
index 8f53e0d11e6c9c6acdc02689beb3a0773311b456..2e72d1961ecc087001735cfca5b862e821b67daa 100755 (executable)
--- a/tests/cond3.test
+++ b/tests/cond3.test
@@ -38,6 +38,7 @@ endif
 targ_SOURCES = $(SONE) $(STWO) $(STHREE)
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 # `b top' so that

diff --git a/tests/cond4.test b/tests/cond4.test
index 42d7251156145c90ff055fcb22610950d8c2d665..51a13e4caba9af69792fd454f72db4fddd247ceb 100755 (executable)
--- a/tests/cond4.test
+++ b/tests/cond4.test
@@ -26,6 +26,7 @@ endif
 targ_SOURCES = main.c $(OPT1) $(OPT2)
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 test "`grep TWO_FALSE Makefile.in | wc -l`" -eq 2

diff --git a/tests/cond5.test b/tests/cond5.test
index 926f2f0c92c27e2991443e1f2e8c23d6b4e3656b..02e2be86267e78b0456c2f55a64727f794c676c8 100755 (executable)
--- a/tests/cond5.test
+++ b/tests/cond5.test
@@ -28,6 +28,7 @@ END
 
 # The bug is that automake hangs.  So we give it a few seconds and
 # then kill it.
+$ACLOCAL || exit 1
 $AUTOMAKE &
 pid=$!
 

diff --git a/tests/cond8.test b/tests/cond8.test
index 43deacd18a93812b63e164e755abbad0638fd950..94d29b2f4a857126319383870645a501acfeff14 100755 (executable)
--- a/tests/cond8.test
+++ b/tests/cond8.test
@@ -16,4 +16,5 @@ noinst_PROGRAMS = x y
 endif
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/condlib.test b/tests/condlib.test
index 9b07528e733f787ab51a578a0ab99a4bafbb6f43..e64062f289b5251002ac53956b8ce03c9b67fb8f 100755 (executable)
--- a/tests/condlib.test
+++ b/tests/condlib.test
@@ -21,6 +21,7 @@ nodist_librsaref_a_SOURCES = desc.c digit.c
 BUILT_SOURCES = $(nodist_librsaref_a_SOURCES)
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep librsaref.a.c Makefile.in && exit 1

diff --git a/tests/conf2.test b/tests/conf2.test
index 690b9d4db8de063dab0e8d5143d2e01e8245a35c..05eccf2c064c55e53aa08fac8a37243566dc0306 100755 (executable)
--- a/tests/conf2.test
+++ b/tests/conf2.test
@@ -21,4 +21,5 @@ END
 : > config.h.in
 : > two.h.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/confh4.test b/tests/confh4.test
index e9a73f60e969359120ecadaf082c9a222367e344..763c5796abfe0f154234f6fd2408790ecd07fc1b 100755 (executable)
--- a/tests/confh4.test
+++ b/tests/confh4.test
@@ -26,6 +26,7 @@ mkdir include
 : > include/Makefile.am
 : > include/config.h.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 egrep '^DEFS =.* -I(\.|\$\(top_builddir\))/include' Makefile.in

diff --git a/tests/config.test b/tests/config.test
index 7c3775a9bbc9e177b94862dac576b18f2f313306..8e4a0ce43b78c92e81559254ca55c30dcfeb6566 100755 (executable)
--- a/tests/config.test
+++ b/tests/config.test
@@ -22,6 +22,7 @@ END
 mkdir subdir
 : > subdir/config.h.in
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^subdir/config.h:' Makefile.in

diff --git a/tests/confincl.test b/tests/confincl.test
index a6e0932b44b6ffaf559847ca1d7ed1e0aec3312c..4f155224cc3dade822b610cd109888a2deb70f45 100755 (executable)
--- a/tests/confincl.test
+++ b/tests/confincl.test
@@ -14,6 +14,7 @@ cat > Makefile.am << 'EOF'
 bin_PROGRAMS = fred
 EOF
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 if grep '@CONFIG_INCLUDE_SPEC@' Makefile.in; then

diff --git a/tests/confsub.test b/tests/confsub.test
index 73a4f04d1aace06cc78fa2de6c6db51ef04584b2..a66679b47c1f0e065589b0844a0230d56aa79557 100755 (executable)
--- a/tests/confsub.test
+++ b/tests/confsub.test
@@ -29,6 +29,7 @@ END
 
 mv depcomp subdir
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 # Make sure subdir Makefile.in doesn't itself look in the subdir.

diff --git a/tests/cxxansi.test b/tests/cxxansi.test
index a0d949d97931f3ed11d51ba98bc3db4dc55c537f..c27972ef390ad76a23fe9e96131a151b18867fa4 100755 (executable)
--- a/tests/cxxansi.test
+++ b/tests/cxxansi.test
@@ -22,6 +22,7 @@ END
 : > doe.C
 : > jane.C
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep '$U' Makefile.in && exit 1

diff --git a/tests/cxxlibobj.test b/tests/cxxlibobj.test
index 13add3482b09093e2c58c4c0e0b6c76f3cb9b531..1bbd0a6da35b03bac1dc8f7ae7f24008b72a6f68 100755 (executable)
--- a/tests/cxxlibobj.test
+++ b/tests/cxxlibobj.test
@@ -20,6 +20,7 @@ END
 : > doe.C
 : > jane.C
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep CC Makefile.in

diff --git a/tests/cxxlink.test b/tests/cxxlink.test
index bcf03bba3f1f71e1084d181b3e1a0b467b11b808..9a0f63d92648afe3b0996f453fd3e48ebd4b1d2c 100755 (executable)
--- a/tests/cxxlink.test
+++ b/tests/cxxlink.test
@@ -17,6 +17,7 @@ END
 : > lava.c
 : > lamp.cxx
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 # Look for this macro not at the beginning of any line; that will have

diff --git a/tests/cxxnoc.test b/tests/cxxnoc.test
index 558040d278536ba44fd62a5aae382c34e442e5e1..56ca8c760906fdc1343e943adb71a3b55f560af8 100755 (executable)
--- a/tests/cxxnoc.test
+++ b/tests/cxxnoc.test
@@ -16,6 +16,7 @@ END
 : > doe.C
 : > jane.C
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep CC Makefile.in | grep -v MKDEP && exit 1

diff --git a/tests/cxxo.test b/tests/cxxo.test
index 1c86b8cc4968b653d022ff2b3f1f2aa47b3e928d..8fe584b366e5eddb9c4655e14db8ce1ad95fe9f4 100755 (executable)
--- a/tests/cxxo.test
+++ b/tests/cxxo.test
@@ -14,6 +14,7 @@ END
 
 : > doe.C
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep 'doe.$(OBJEXT)' Makefile.in

diff --git a/tests/cygwin32.test b/tests/cygwin32.test
index fd571dfca7b8b777a0f3b57e0a22e780d9d779ff..a689b73bfb6ea8d9f8393b85d60a1ad86da82455 100755 (executable)
--- a/tests/cygwin32.test
+++ b/tests/cygwin32.test
@@ -19,6 +19,7 @@ END
 : > www.c
 : > xtra.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^CYGWIN' Makefile.in && exit 1

diff --git a/tests/defun2.test b/tests/defun2.test
index d6869c5f5c75bd6ce83ed4b21fda348040ebd8f7..6f58cab629494315f65f8c31bf303b32d000a600 100755 (executable)
--- a/tests/defun2.test
+++ b/tests/defun2.test
@@ -20,4 +20,5 @@ END
 
 : > memcmp.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/depend.test b/tests/depend.test
index 64d9a4adcc267e0ab0d0b2f3936381c18cdc58cc..70234bbb697cd490db00fab680185cbe5d5d60df 100755 (executable)
--- a/tests/depend.test
+++ b/tests/depend.test
@@ -14,6 +14,7 @@ fred_SOURCES = \
    fred.c
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 # In this case we no longer expect to find DEP_FILES.

diff --git a/tests/depend3.test b/tests/depend3.test
index 99130ab20060299bd279f75c83289f46ae9df94e..2fe15ae15ae22f845fbaaf4d3d17ab5cadafd78b 100755 (executable)
--- a/tests/depend3.test
+++ b/tests/depend3.test
@@ -33,4 +33,5 @@ DEPS = @DEPS@
 TerraVision_DEPENDENCIES = $(DEPS)
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/discover.test b/tests/discover.test
index ac7485615d4ec2b6f3773c559ab6a5fff507cff8..c736e618d02ec403a8c60209c3da2a141ebe010c 100755 (executable)
--- a/tests/discover.test
+++ b/tests/discover.test
@@ -24,5 +24,6 @@ END
 
 : > fsusage.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/double.test b/tests/double.test
index 09222139b6d4467a11ac5ac3e016bd0d963e7410..5e781e84a8b9c4284ece11af09ebf778e56a2f81 100755 (executable)
--- a/tests/double.test
+++ b/tests/double.test
@@ -11,4 +11,5 @@ cat > Makefile.am << 'END'
 bin_PROGRAMS = spice nutmeg help sconvert multidec nutmeg
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/empty2.test b/tests/empty2.test
index d15cbc68366b9a8ed4739f37855c7dd64318069f..fed0631ad59f55822a0d8733da22d50aac0004ca 100755 (executable)
--- a/tests/empty2.test
+++ b/tests/empty2.test
@@ -14,6 +14,7 @@ bin_PROGRAMS = pavel
 pavel_SOURCES =
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep 'pavel\.[co]' Makefile.in && exit 1

diff --git a/tests/empty3.test b/tests/empty3.test
index 6ac7da0ea7f0ffe57d9ed287392ad52569337be4..55a52be3f320fd2f98363a7fb5097a0d2a289726 100755 (executable)
--- a/tests/empty3.test
+++ b/tests/empty3.test
@@ -12,6 +12,7 @@ cat > Makefile.am << 'END'
 bin_PROGRAMS = pavel
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep 'pavel\.[co]' Makefile.in

diff --git a/tests/empty4.test b/tests/empty4.test
index 82cde298f4d2bb7ec5aac1b09766da747b704edf..0ed85da088ef0e0dd53137e58d40898027bcbf42 100755 (executable)
--- a/tests/empty4.test
+++ b/tests/empty4.test
@@ -18,6 +18,7 @@ zoo_DEPENDENCIES = $(ZOO_OBJ)
 zoo_LDADD = $(zoo_DEPENDENCIES)
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 fgrep zoo. Makefile.in && exit 1
 exit 0

diff --git a/tests/exsource.test b/tests/exsource.test
index 7f2651059f8c1597b6950d799c16f678b3439001..0bd9aaa638659724eb74041a8912afc88b0a5ea6 100755 (executable)
--- a/tests/exsource.test
+++ b/tests/exsource.test
@@ -27,6 +27,7 @@ END
 : > www.c
 : > xtra.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '@_am_include@ .*/xtra\.P' Makefile.in

diff --git a/tests/ext.test b/tests/ext.test
index 09000a1138364a8c160a1e9519497589deb462df..8b826bca2b28d1b3c1d60177ae734339754fb459 100755 (executable)
--- a/tests/ext.test
+++ b/tests/ext.test
@@ -14,6 +14,7 @@ bin_PROGRAMS = foo
 foo_SOURCES = 1.f 2.for 3.f90 4.F 5.r 6.m
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 for ext in f for f90 F r m

diff --git a/tests/extra.test b/tests/extra.test
index f79c99fd8bc0e8347fdec68a84e58cfde9e73e84..933a4b9bada53380d7a2790af3d8950cda0c8a65 100755 (executable)
--- a/tests/extra.test
+++ b/tests/extra.test
@@ -16,6 +16,7 @@ bin_PROGRAMS = @foo@
 EXTRA_PROGRAMS = zardoz
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep "^zardoz" Makefile.in || exit 1

diff --git a/tests/header.test b/tests/header.test
index 798e50724dd41975547bc4c3e6436e1268274600..9f50e299b88a5f7305070e555f324a75d182c194 100755 (executable)
--- a/tests/header.test
+++ b/tests/header.test
@@ -24,6 +24,7 @@ END
 : > joe.c
 : > qq.h
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '[^@]MY_HEADERS' Makefile.in && exit 1

diff --git a/tests/implicit.test b/tests/implicit.test
index b2fb984516290b0379ce322d084282fc4d46710c..d2bb72f3205a638477869038a2420af547f21492 100755 (executable)
--- a/tests/implicit.test
+++ b/tests/implicit.test
@@ -13,6 +13,7 @@ cat > Makefile.am << 'END'
 noinst_PROGRAMS = libapp_1
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^libapp_1_OBJECTS' Makefile.in | fgrep '.$(OBJEXT)'

diff --git a/tests/interp.test b/tests/interp.test
index 90c1e5adb62e9d480cc3b14e0ca2b19e9ca98fb5..7e21ba11cf14d404da8cc09c75aba5894776aafb 100755 (executable)
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -14,6 +14,7 @@ s1 = z.c
 qqq_SOURCES = $(s1)
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep 'z.$(OBJEXT)' Makefile.in

diff --git a/tests/interp2.test b/tests/interp2.test
index 4404a9d87b0812a4eca1660fb50ee889afdbb79c..efaae4e3d21e97540b617f0faa3f0e7c585de457 100755 (executable)
--- a/tests/interp2.test
+++ b/tests/interp2.test
@@ -17,4 +17,5 @@ x_SOURCES = x.c
 x_LDADD = $(X_EXTRA_LIBS)
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/ldadd.test b/tests/ldadd.test
index 2b7fbd45aef5b7789a066e9b9d7bac080c44acc6..0334b2c670f5056297a7bd44d32ba2da14e6a5fc 100755 (executable)
--- a/tests/ldadd.test
+++ b/tests/ldadd.test
@@ -30,5 +30,6 @@ END
 : > config.sub
 : > q.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/ldflags.test b/tests/ldflags.test
index 12d57f98b63235b0a89c931ce3c8c963e003c041..21f52071faf81f8548b2e162892cfbee13d22030 100755 (executable)
--- a/tests/ldflags.test
+++ b/tests/ldflags.test
@@ -33,4 +33,5 @@ END
 : > config.sub
 : > q.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/lex.test b/tests/lex.test
index e9b565e4f56e7c7ca34e9617499424874e4395ac..0c9652141634ef86ceef93753b7649a17cb0c7cf 100755 (executable)
--- a/tests/lex.test
+++ b/tests/lex.test
@@ -17,6 +17,7 @@ END
 
 : > joe.l
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '\$(LEX)' Makefile.in

diff --git a/tests/lex2.test b/tests/lex2.test
index a641167d82c322b57a24bf4783019f73da73e172..34d45a9cc156abf9ec235b71beecd886dfb2f9c5 100755 (executable)
--- a/tests/lex2.test
+++ b/tests/lex2.test
@@ -18,5 +18,6 @@ END
 
 : > joe.l
 
+$ACLOCAL || exit 1
 $AUTOMAKE --Wno-error 2> output || exit 1
 test -n "`cat output`"

diff --git a/tests/lex3.test b/tests/lex3.test
index 1fa9671857ae57af225a24f699fed5ab14d2b4b1..c3c751533fb5f07f97cdfa97e0989a7925283371 100755 (executable)
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -18,6 +18,7 @@ END
 
 : > joe.l
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep joel Makefile.in && exit 1

diff --git a/tests/lex4.test b/tests/lex4.test
index 156c515307be64ea4a3b0f3e272497571a84d158..b40fc54fcf972cbc49c65d784f01eccb08b1ef4b 100755 (executable)
--- a/tests/lex4.test
+++ b/tests/lex4.test
@@ -18,6 +18,7 @@ END
 
 : > joe.ll
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep joe.Po Makefile.in

diff --git a/tests/libobj.test b/tests/libobj.test
index 0b44f581f7a4ebab4a4b74aaae90060036d767e2..2ec2a9eb77c759b4bb00b7f98618f2612bc29cd1 100755 (executable)
--- a/tests/libobj.test
+++ b/tests/libobj.test
@@ -28,4 +28,5 @@ END
 : > fsusage.c
 : > mountlist.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/libobj10.test b/tests/libobj10.test
index 07e3cc2c71d3f54c53460ca40f2095c42e2f56d7..c576cfb9a20b5834ec2ee6ae84eddb56430f24da 100755 (executable)
--- a/tests/libobj10.test
+++ b/tests/libobj10.test
@@ -23,6 +23,7 @@ noinst_LIBRARIES = libfoo.a
 libfoo_a_LIBADD = @LIBOBJS@
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 
 echo 'BUILT_SOURCES = foo.c' >> Makefile.am

diff --git a/tests/libobj2.test b/tests/libobj2.test
index e38abd66b9dccd9be03290771eeb1fb3f3b9c3c9..305099f1e1a7325fe43798c4f0be7cc1c6dc6704 100755 (executable)
--- a/tests/libobj2.test
+++ b/tests/libobj2.test
@@ -30,6 +30,7 @@ END
 
 mv depcomp subdir
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep 'fsusage\.c' subdir/Makefile.in

diff --git a/tests/libobj4.test b/tests/libobj4.test
index 226e5099f4d1e529002691a9bbfda24a0dd306dd..c11ddd0ec9a166b32b51e522af25ddfb2810c8f6 100755 (executable)
--- a/tests/libobj4.test
+++ b/tests/libobj4.test
@@ -14,4 +14,5 @@ AC_PROG_CC
 AC_REPLACE_FUNCS(foo)
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/libobj5.test b/tests/libobj5.test
index 8ad45e9673022967b1f486660c10a5d50ccb4e72..9af320d59a0f3a36bb56a1dd04476247fc1055f9 100755 (executable)
--- a/tests/libobj5.test
+++ b/tests/libobj5.test
@@ -18,5 +18,6 @@ END
 
 : > foo.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 fgrep foo.c Makefile.in

diff --git a/tests/libobj6.test b/tests/libobj6.test
index aa63df78dad043d1ddcb621ee4fe903a60baebd0..1dd1fa3c063ea644fce50edb951c6057f6243d38 100755 (executable)
--- a/tests/libobj6.test
+++ b/tests/libobj6.test
@@ -27,4 +27,5 @@ END
 : > fsusage.c
 : > mountlist.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/libobj7.test b/tests/libobj7.test
index 95432e357eefa35073c36b8eb7f0ba76230eef58..e9312050b2650faddaa6b7437ab167c443fb3b78 100755 (executable)
--- a/tests/libobj7.test
+++ b/tests/libobj7.test
@@ -27,6 +27,7 @@ END
 : > dirname.c
 : > strsignal.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 sed -n -e ': again

diff --git a/tests/libobj8.test b/tests/libobj8.test
index 37a4934a2ce717d3ad53680c915b6288b1a674a4..ceca716fdbf480564cdf231f239f334c43f65c2d 100755 (executable)
--- a/tests/libobj8.test
+++ b/tests/libobj8.test
@@ -33,6 +33,7 @@ END
 : > ansi2knr.1
 : > ansi2knr.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep 'strsignal_.c:' Makefile.in

diff --git a/tests/libobj9.test b/tests/libobj9.test
index 7537f86590c3c52579abdc427f6cdaf5bdfb63cc..fa9412feffd626f23c176889dca0798a0dbc064e 100755 (executable)
--- a/tests/libobj9.test
+++ b/tests/libobj9.test
@@ -27,4 +27,5 @@ END
 
 : > mountlist.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

diff --git a/tests/library.test b/tests/library.test
index baf61090869d886134b4fa8bb1859caa36ac9fa2..e631da5b15fe1bbd5b473ad8a40abfaf6262dc22 100755 (executable)
--- a/tests/library.test
+++ b/tests/library.test
@@ -17,4 +17,5 @@ lib_LIBRARIES = libfoo.a
 libfoo_a_DEPENDENCIES = libzot.a
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/link_c_cxx.test b/tests/link_c_cxx.test
index 8ff69a4592e998def48e6de480dc865e080b115b..28ad8a5b5d50138544932de898917a85c61848ce 100755 (executable)
--- a/tests/link_c_cxx.test
+++ b/tests/link_c_cxx.test
@@ -18,6 +18,7 @@ END
 : > lava.c
 : > lamp.cxx
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 

diff --git a/tests/link_f_c.test b/tests/link_f_c.test
index 8dea51cc7056b6c46bbe24844732bf24b8e68ab1..194dc5b45e3c470196289b583ed9bc63a2357d0b 100755 (executable)
--- a/tests/link_f_c.test
+++ b/tests/link_f_c.test
@@ -18,6 +18,7 @@ END
 : > lava.c
 : > lamp.f
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 

diff --git a/tests/link_f_c_cxx.test b/tests/link_f_c_cxx.test
index 8155576afb8278b268189d903153490ad816e14d..743c8e392673551049e6fb24e1c8a566a2f5ef50 100755 (executable)
--- a/tests/link_f_c_cxx.test
+++ b/tests/link_f_c_cxx.test
@@ -20,6 +20,7 @@ END
 : > lamp.cxx
 : > lamp2.f
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 

diff --git a/tests/link_f_cxx.test b/tests/link_f_cxx.test
index c90b2631e49e06b8ec09ac48a7684cf3ff62631f..11e21c5db7ef7dfbcdb10c159e4593194b248f19 100755 (executable)
--- a/tests/link_f_cxx.test
+++ b/tests/link_f_cxx.test
@@ -18,6 +18,7 @@ END
 : > lava.cxx
 : > lamp.f
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 

diff --git a/tests/listval.test b/tests/listval.test
index 18fd6fff89561be548bd0ac18220be950991370e..824289c7b484b08cbcd595b1fce0931a0ddcbd42 100755 (executable)
--- a/tests/listval.test
+++ b/tests/listval.test
@@ -23,4 +23,5 @@ END
 : > config.guess
 : > config.sub
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/ltlibobjs.test b/tests/ltlibobjs.test
index f199b0bcdcac14c7371d7d84e9c7e32335eb2e73..fed7ae280d7f23f47f63111fe55d9a452128beb3 100755 (executable)
--- a/tests/ltlibobjs.test
+++ b/tests/ltlibobjs.test
@@ -21,4 +21,5 @@ END
 : > config.guess
 : > config.sub
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/nodep.test b/tests/nodep.test
index 2ef8b92053fbd39cb505ba11af0a656e20f4ae30..11c7fd7c3df616502176a575672e99bb423aa414 100755 (executable)
--- a/tests/nodep.test
+++ b/tests/nodep.test
@@ -19,6 +19,7 @@ mkdir x
 
 : > y.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '%' Makefile.in && exit 1

diff --git a/tests/nodist.test b/tests/nodist.test
index 6e4ed89b8ac463a3ad56eb7f501c08ad0a82f5bd..08b8088278f6e83a534d9aac1b9e7c877a93aa41 100755 (executable)
--- a/tests/nodist.test
+++ b/tests/nodist.test
@@ -18,6 +18,7 @@ END
 : > b.c
 : > c.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^am_eyeball_OBJECTS' Makefile.in || exit 1

diff --git a/tests/noinstdir.test b/tests/noinstdir.test
index 48770471e5d5deb200cc00b14bece86f6a5f28a8..6c04edfdaab6bea2711b4e63e0fc0df978f8a340 100755 (executable)
--- a/tests/noinstdir.test
+++ b/tests/noinstdir.test
@@ -23,6 +23,7 @@ AC_PROG_CC
 AC_PROG_RANLIB
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep 'noinstdir' Makefile.in && exit 1

diff --git a/tests/nostdinc.test b/tests/nostdinc.test
index aea1e3e2f007693928cc9cf16358950e97a6b8cf..2faf1d2ac345fcea31239214c220e24340450bdf 100755 (executable)
--- a/tests/nostdinc.test
+++ b/tests/nostdinc.test
@@ -14,6 +14,7 @@ bin_PROGRAMS = foo
 foo_SOURCES = foo.c
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep -e '-I.' Makefile.in && exit 1

diff --git a/tests/number.test b/tests/number.test
index d4af17e70a2362b56b001e25eb1b1c3dc620c608..3ab95dbb1a228a6ee0832e39e245617b1ffc9b84 100755 (executable)
--- a/tests/number.test
+++ b/tests/number.test
@@ -13,6 +13,7 @@ cat > Makefile.am << 'END'
 bin_PROGRAMS = zardoz
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 count=`grep -c '^zardoz_OBJECTS' Makefile.in`

diff --git a/tests/objc.test b/tests/objc.test
index 1b8b4db1ee0df5e3cc0c77e08803d558459bc9b8..94df3700cab59778a9d500ac705e8f2cd2a4a4bc 100755 (executable)
--- a/tests/objc.test
+++ b/tests/objc.test
@@ -17,6 +17,7 @@ END
 
 : > foo.m
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^LINK' Makefile.in

diff --git a/tests/parse.test b/tests/parse.test
index b861ef9365e41150fc384513f03f1cea70b7640e..3e5129481ad97a0bbad74933c85de192f54ac653 100755 (executable)
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -23,6 +23,7 @@ zar.c\
 doz.c
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep zar.cdoz Makefile.in && exit 1

diff --git a/tests/pluseq4.test b/tests/pluseq4.test
index 9d6701384f37ef7dee72be7e765e0b3bc0dfc616..5f8637faf77d323147f5e0bc23d3b02e79ebada3 100755 (executable)
--- a/tests/pluseq4.test
+++ b/tests/pluseq4.test
@@ -13,5 +13,6 @@ END
 
 : > foo.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 fgrep '@CC@ -Dwhatever' Makefile.in

diff --git a/tests/pluseq7.test b/tests/pluseq7.test
index 49cf1847443b647a87c7ad121d1e6f2bf2adc838..95d4b68bb3872335609f1e8c8f73a4569c91977d 100755 (executable)
--- a/tests/pluseq7.test
+++ b/tests/pluseq7.test
@@ -18,5 +18,6 @@ END
 
 : > q.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/pr72.test b/tests/pr72.test
index 5e5c1cefca73866aeed685dd08d415a41b76fe7d..75d1dcd1b0aed733cdca028a1a714a1c1dad8759 100755 (executable)
--- a/tests/pr72.test
+++ b/tests/pr72.test
@@ -20,6 +20,7 @@ END
 : > config.guess
 : > config.sub
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^LINK ' Makefile.in

diff --git a/tests/prefix.test b/tests/prefix.test
index f14208cd751b5a9be41a54646bcdd77ec37382cc..3761d2c09c8b0d9008a6f38f79fbbcd9e409b7ae 100755 (executable)
--- a/tests/prefix.test
+++ b/tests/prefix.test
@@ -13,4 +13,5 @@ bnidir = $(prefix)/bni
 bni_PROGRAMS = zardoz
 EOF
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/primary2.test b/tests/primary2.test
index 89f0bc6bf33b9013e75aab3385455ddb2bd5a20d..305d514e345c7203ec0992a5e413083b601e151f 100755 (executable)
--- a/tests/primary2.test
+++ b/tests/primary2.test
@@ -11,5 +11,6 @@ bin_PROGRAMS = @programs@
 EXTRA_PROGRAMS = joe @more@
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/ranlib.test b/tests/ranlib.test
index d977a392b954080f19de77c1931943e19fbdd56e..2da817246d65d7727b47bf9b622ad0db180806ac 100755 (executable)
--- a/tests/ranlib.test
+++ b/tests/ranlib.test
@@ -17,4 +17,5 @@ END
 : > config.guess
 : > config.sub
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/recurs.test b/tests/recurs.test
index 9816df1a0fa96257671e13a137825774ad6b56ba..39b1b9cc6d7618f7d61e168914c6a3368c3368a5 100755 (executable)
--- a/tests/recurs.test
+++ b/tests/recurs.test
@@ -17,5 +17,6 @@ bin_PROGRAMS = $(foo)
 foo = $(bin_PROGRAMS)
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/recurs2.test b/tests/recurs2.test
index 6611b834253663cc8a6892f04bb75b73db1e1507..5b07f191dde1b5dbde3265617e49709c8121b5fc 100755 (executable)
--- a/tests/recurs2.test
+++ b/tests/recurs2.test
@@ -20,4 +20,5 @@ END
 > chgrp.1
 > chgrp.x
 
-$AUTOMAKE
\ No newline at end of file
+$ACLOCAL || exit 1
+$AUTOMAKE

diff --git a/tests/sourcesub.test b/tests/sourcesub.test
index 01a2175c1211ffe057a2c117db163624b8460cbc..7e83886c16de8561eaee6a79a2903176a05076fe 100755 (executable)
--- a/tests/sourcesub.test
+++ b/tests/sourcesub.test
@@ -14,5 +14,6 @@ x_SOURCES = x.c @FOO@
 EXTRA_x_SOURCES = y.c
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/space.test b/tests/space.test
index 47aefcd95a54eb2fa47df4be64a3af49f298ddc6..def0654f63d1390b0f3809487f5968225b5229ff 100755 (executable)
--- a/tests/space.test
+++ b/tests/space.test
@@ -11,4 +11,5 @@ cat > Makefile.am << 'END'
 foo_SOURCES = foo.c
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE

diff --git a/tests/specflags.test b/tests/specflags.test
index 060f8d496d80de103723bbaeb23de7bfa6225151..2e03e74fa933c388b9a10d7ce8c9daccac8106f4 100755 (executable)
--- a/tests/specflags.test
+++ b/tests/specflags.test
@@ -16,6 +16,7 @@ foo_CFLAGS = -DBAR
 END
 
 # Make sure `compile' is required.
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 
 : > compile

diff --git a/tests/specflags2.test b/tests/specflags2.test
index 1da10e2ac566bc5abb0da63aceda72854d74017d..2866404dcc1f3c84cbdeda7183da1d382f9850ad 100755 (executable)
--- a/tests/specflags2.test
+++ b/tests/specflags2.test
@@ -19,6 +19,7 @@ libfoo_a_CXXFLAGS = -DZOT
 END
 
 # Make sure `compile' is required.
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 
 : > compile

diff --git a/tests/specflags3.test b/tests/specflags3.test
index c99aa407ab67dc239bfe712750e713d7986f1677..8489e7f01a9ffb3ed7ed2685b4c5c05a2d197388 100755 (executable)
--- a/tests/specflags3.test
+++ b/tests/specflags3.test
@@ -16,6 +16,7 @@ END
 
 : > compile
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep -e '-o foo-foo' Makefile.in

diff --git a/tests/specflags4.test b/tests/specflags4.test
index c41c0d263a71d477057092b0175a3ef636b09e09..c6de58d7947b212dd9866cf1855b4cb4f98482b9 100755 (executable)
--- a/tests/specflags4.test
+++ b/tests/specflags4.test
@@ -20,6 +20,7 @@ END
 
 : > compile
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep 'test1.o.o' Makefile.in && exit 1

diff --git a/tests/specflags5.test b/tests/specflags5.test
index a4afdca2bd7076d737a12201f325a3f075d40585..fb26924d70a157fb01e8cca33be9007e2bac84ef 100755 (executable)
--- a/tests/specflags5.test
+++ b/tests/specflags5.test
@@ -17,6 +17,7 @@ END
 
 : > compile
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep '$(foo_CFLAGS)' Makefile.in

diff --git a/tests/spell2.test b/tests/spell2.test
index f5e4e791605b04471e5b201411264cc625633619..e07240ca839beb0b444fbd9f2a85a38f69f37f49 100755 (executable)
--- a/tests/spell2.test
+++ b/tests/spell2.test
@@ -12,5 +12,6 @@ zardoz_SOURCES = x.c
 qardoz_LDADD = -ljoe
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/stdlib.test b/tests/stdlib.test
index 5e8031a3774f039a097b69e027f2b053bad21620..e284bd63a43559e5751b77b7156d4985eae34704 100755 (executable)
--- a/tests/stdlib.test
+++ b/tests/stdlib.test
@@ -13,6 +13,7 @@ cat > Makefile.am << 'END'
 noinst_LIBRARIES = foo
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE 2> output.log && exit 1
 # We're specifically testing for line-number information.
 # Well, when it is implemented.

diff --git a/tests/subdir3.test b/tests/subdir3.test
index 1f14acaef5af628f5a77789bc6d40e17b1873585..c69cad83194659b581ac3557e495eaffe9796c13 100755 (executable)
--- a/tests/subdir3.test
+++ b/tests/subdir3.test
@@ -19,6 +19,7 @@ mkdir x
 : > y.c
 : > x/z.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep '^z\.o: x/z\.c$' Makefile.in

diff --git a/tests/subdir4.test b/tests/subdir4.test
index 76cfee2742873e3570031b5d217bd45177c6ed51..893e0784df517145ec6ae8c5991a0697c00c16b4 100755 (executable)
--- a/tests/subdir4.test
+++ b/tests/subdir4.test
@@ -45,6 +45,7 @@ cat > src/Makefile.am << 'END'
 pkgdata_DATA =
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE --gnu || exit 1
 
 # Make sure that depcomp is *not* included in the definition

diff --git a/tests/subobj.test b/tests/subobj.test
index f2cfc29dc73f78a508ac4e58325128f3fe9bc8f0..f9245b85793971bd3c3b2f7d1146be7fa122369d 100755 (executable)
--- a/tests/subobj.test
+++ b/tests/subobj.test
@@ -17,6 +17,7 @@ END
 
 : > compile
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep 'generic/a.$(OBJEXT)' Makefile.in || exit 1

diff --git a/tests/subobj2.test b/tests/subobj2.test
index 302f6a8664a331314dba0811905fdf18ce3edc3c..2d46f2f1e0569b23474ac454b07599a6e252dc3c 100755 (executable)
--- a/tests/subobj2.test
+++ b/tests/subobj2.test
@@ -16,6 +16,7 @@ END
 
 : > compile
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 fgrep 'generic/a.$(OBJEXT)' Makefile.in || exit 1

diff --git a/tests/subobj4.test b/tests/subobj4.test
index 5b12f38840d43ac9ebfe039fd49cae44d8ed4893..452d25d8b02379cb6b953ce0b5341a48760de791 100755 (executable)
--- a/tests/subobj4.test
+++ b/tests/subobj4.test
@@ -35,6 +35,7 @@ END
 : > compile
 : > d2/z.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep 'CC.*z' d1/Makefile.in

diff --git a/tests/suffix.test b/tests/suffix.test
index ee426790fb66ac1fd10722ea9084aaec42a5f19b..74f0e2b5dd65df1f0b071ffd9bb6ac475f70fe17 100755 (executable)
--- a/tests/suffix.test
+++ b/tests/suffix.test
@@ -12,6 +12,7 @@ cat > Makefile.am << 'END'
 noinst_PROGRAMS = foo
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE -i || exit 1
 
 grep '^\.c\.o' Makefile.in > /dev/null || exit 1

diff --git a/tests/suffix2.test b/tests/suffix2.test
index d9f1d1385e720b9ab6f7e8fab448a3386825bc06..4348a8aa92a5a37a60e0226dd83359d5dd9c514e 100755 (executable)
--- a/tests/suffix2.test
+++ b/tests/suffix2.test
@@ -27,6 +27,7 @@ END
 
 set -e
 
+$ACLOCAL || exit 1
 $AUTOMAKE -a
 
 grep -c '^\.c\.o:' Makefile.in   | grep '^1$'

diff --git a/tests/suffix3.test b/tests/suffix3.test
index 0bbc8cd024d85afde21d6fa7257ccada4e1e20b2..cb2370ab9128c2167880a15d4506be2374a5f48f 100755 (executable)
--- a/tests/suffix3.test
+++ b/tests/suffix3.test
@@ -16,6 +16,7 @@ bin_PROGRAMS = foo
 foo_SOURCES = foo.zoo
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE --Wno-error || exit 1
 
 fgrep foo.cc Makefile.in && exit 1

diff --git a/tests/target.test b/tests/target.test
index 532c2e6ab6139c48584cd92de46542cda501f6e1..55862398f643a8a26d90add7d230ac08cc803c6d 100755 (executable)
--- a/tests/target.test
+++ b/tests/target.test
@@ -15,5 +15,6 @@ END
 
 echo > consud.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/xsource.test b/tests/xsource.test
index 566944422f25b6f117d20a44baf5368489d46607..1ed5ca91de3afa6627a68232a9d45f1095ff9196 100755 (executable)
--- a/tests/xsource.test
+++ b/tests/xsource.test
@@ -19,5 +19,6 @@ mkdir x
 : > z.c
 : > x/z.c
 
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0

diff --git a/tests/yacc.test b/tests/yacc.test
index 3dd07492831eb0c2c8a1b0eb412fa06a73205217..33f74eeb1ba6bdba02e37f4f82feb56f02464e0a 100755 (executable)
--- a/tests/yacc.test
+++ b/tests/yacc.test
@@ -15,6 +15,7 @@ bin_PROGRAMS = zardoz
 zardoz_SOURCES = zardoz.y
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep 'zardoz.c' Makefile.in

diff --git a/tests/yacc2.test b/tests/yacc2.test
index 9e71d86f5777cf722db96e320b71d7bd06249a6b..8bbb1cc325ae3dc724503fb2b7b54b6c7d77c9bc 100755 (executable)
--- a/tests/yacc2.test
+++ b/tests/yacc2.test
@@ -21,6 +21,7 @@ cp Makefile.am Makefile.src
 
 
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 # If zardoz.h IS mentioned, fail

diff --git a/tests/yacc3.test b/tests/yacc3.test
index cbfe66b377f19fbf24cb2807145170c1749cd685..2d073bdaecb078ec83e2008bee2c65aff94387ac 100755 (executable)
--- a/tests/yacc3.test
+++ b/tests/yacc3.test
@@ -17,6 +17,7 @@ magic:
        @echo $(DIST_COMMON)
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 # It should not be disted here

diff --git a/tests/yaccpp.test b/tests/yaccpp.test
index c61c169088378b90098250a72c668227562b0fa2..9ee5b2d8e27c3732fa3d60060ac41499310a85a2 100755 (executable)
--- a/tests/yaccpp.test
+++ b/tests/yaccpp.test
@@ -14,6 +14,7 @@ bin_PROGRAMS = zardoz
 zardoz_SOURCES = zardoz.yy
 END
 
+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 grep zardoz.cc Makefile.in