From 86ed47185d345b6dd7d9ac23bdbb6856445be204 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 9 Apr 2001 14:50:46 +0000 Subject: [PATCH] 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], ...)'. --- ChangeLog | 15 +++++++++++++++ automake.in | 6 +++--- depend2.am | 39 +++++++++++++++++++++++++------------- lib/am/depend2.am | 39 +++++++++++++++++++++++++------------- m4/depend.m4 | 15 ++------------- tests/ansi2.test | 1 + tests/ansi4.test | 1 + tests/backsl.test | 1 + tests/badprog.test | 1 + tests/canon.test | 1 + tests/canon3.test | 1 + tests/canon4.test | 1 + tests/canon5.test | 1 + tests/comment2.test | 1 + tests/compile_f_c_cxx.test | 1 + tests/cond3.test | 1 + tests/cond4.test | 1 + tests/cond5.test | 1 + tests/cond8.test | 1 + tests/condlib.test | 1 + tests/conf2.test | 1 + tests/confh4.test | 1 + tests/config.test | 1 + tests/confincl.test | 1 + tests/confsub.test | 1 + tests/cxxansi.test | 1 + tests/cxxlibobj.test | 1 + tests/cxxlink.test | 1 + tests/cxxnoc.test | 1 + tests/cxxo.test | 1 + tests/cygwin32.test | 1 + tests/defun2.test | 1 + tests/depend.test | 1 + tests/depend3.test | 1 + tests/discover.test | 1 + tests/double.test | 1 + tests/empty2.test | 1 + tests/empty3.test | 1 + tests/empty4.test | 1 + tests/exsource.test | 1 + tests/ext.test | 1 + tests/extra.test | 1 + tests/header.test | 1 + tests/implicit.test | 1 + tests/interp.test | 1 + tests/interp2.test | 1 + tests/ldadd.test | 1 + tests/ldflags.test | 1 + tests/lex.test | 1 + tests/lex2.test | 1 + tests/lex3.test | 1 + tests/lex4.test | 1 + tests/libobj.test | 1 + tests/libobj10.test | 1 + tests/libobj2.test | 1 + tests/libobj4.test | 1 + tests/libobj5.test | 1 + tests/libobj6.test | 1 + tests/libobj7.test | 1 + tests/libobj8.test | 1 + tests/libobj9.test | 1 + tests/library.test | 1 + tests/link_c_cxx.test | 1 + tests/link_f_c.test | 1 + tests/link_f_c_cxx.test | 1 + tests/link_f_cxx.test | 1 + tests/listval.test | 1 + tests/ltlibobjs.test | 1 + tests/nodep.test | 1 + tests/nodist.test | 1 + tests/noinstdir.test | 1 + tests/nostdinc.test | 1 + tests/number.test | 1 + tests/objc.test | 1 + tests/parse.test | 1 + tests/pluseq4.test | 1 + tests/pluseq7.test | 1 + tests/pr72.test | 1 + tests/prefix.test | 1 + tests/primary2.test | 1 + tests/ranlib.test | 1 + tests/recurs.test | 1 + tests/recurs2.test | 3 ++- tests/sourcesub.test | 1 + tests/space.test | 1 + tests/specflags.test | 1 + tests/specflags2.test | 1 + tests/specflags3.test | 1 + tests/specflags4.test | 1 + tests/specflags5.test | 1 + tests/spell2.test | 1 + tests/stdlib.test | 1 + tests/subdir3.test | 1 + tests/subdir4.test | 1 + tests/subobj.test | 1 + tests/subobj2.test | 1 + tests/subobj4.test | 1 + tests/suffix.test | 1 + tests/suffix2.test | 1 + tests/suffix3.test | 1 + tests/target.test | 1 + tests/xsource.test | 1 + tests/yacc.test | 1 + tests/yacc2.test | 1 + tests/yacc3.test | 1 + tests/yaccpp.test | 1 + 106 files changed, 174 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index db8fba3b..76411602 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2001-04-09 Akim Demaille + + 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 * tags.am: Fix missing leading tabs. diff --git a/automake.in b/automake.in index c42103ab..9f8bac9c 100755 --- 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 285adf60..421e225b 100644 --- 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 285adf60..421e225b 100644 --- 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 59c95d65..cb73080a 100644 --- 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 9f51f8e9..04368131 100755 --- 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 4775ad33..ac03bbf5 100755 --- 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 a35c5d14..0bf43a66 100755 --- 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 91876a7d..47711e76 100755 --- 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 b54caf32..6745c7da 100755 --- 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 d7a28a71..f6e70fdc 100755 --- 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 5ca51e7b..330ead00 100755 --- 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 9162f991..b05ced44 100755 --- 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 d25a19a9..c2a1d2c1 100755 --- 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 2ef19dcd..8aa08953 100755 --- 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 8f53e0d1..2e72d196 100755 --- 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 42d72511..51a13e4c 100755 --- 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 926f2f0c..02e2be86 100755 --- 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 43deacd1..94d29b2f 100755 --- 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 9b07528e..e64062f2 100755 --- 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 690b9d4d..05eccf2c 100755 --- 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 e9a73f60..763c5796 100755 --- 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 7c3775a9..8e4a0ce4 100755 --- 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 a6e0932b..4f155224 100755 --- 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 73a4f04d..a66679b4 100755 --- 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 a0d949d9..c27972ef 100755 --- 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 13add348..1bbd0a6d 100755 --- 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 bcf03bba..9a0f63d9 100755 --- 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 558040d2..56ca8c76 100755 --- 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 1c86b8cc..8fe584b3 100755 --- 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 fd571dfc..a689b73b 100755 --- 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 d6869c5f..6f58cab6 100755 --- 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 64d9a4ad..70234bbb 100755 --- 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 99130ab2..2fe15ae1 100755 --- 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 ac748561..c736e618 100755 --- 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 09222139..5e781e84 100755 --- 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 d15cbc68..fed0631a 100755 --- 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 6ac7da0e..55a52be3 100755 --- 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 82cde298..0ed85da0 100755 --- 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 7f265105..0bd9aaa6 100755 --- 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 09000a11..8b826bca 100755 --- 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 f79c99fd..933a4b9b 100755 --- 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 798e5072..9f50e299 100755 --- 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 b2fb9845..d2bb72f3 100755 --- 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 90c1e5ad..7e21ba11 100755 --- 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 4404a9d8..efaae4e3 100755 --- 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 2b7fbd45..0334b2c6 100755 --- 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 12d57f98..21f52071 100755 --- 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 e9b565e4..0c965214 100755 --- 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 a641167d..34d45a9c 100755 --- 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 1fa96718..c3c75153 100755 --- 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 156c5153..b40fc54f 100755 --- 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 0b44f581..2ec2a9eb 100755 --- 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 07e3cc2c..c576cfb9 100755 --- 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 e38abd66..305099f1 100755 --- 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 226e5099..c11ddd0e 100755 --- 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 8ad45e96..9af320d5 100755 --- 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 aa63df78..1dd1fa3c 100755 --- 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 95432e35..e9312050 100755 --- 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 37a4934a..ceca716f 100755 --- 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 7537f865..fa9412fe 100755 --- 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 baf61090..e631da5b 100755 --- 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 8ff69a45..28ad8a5b 100755 --- 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 8dea51cc..194dc5b4 100755 --- 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 8155576a..743c8e39 100755 --- 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 c90b2631..11e21c5d 100755 --- 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 18fd6fff..824289c7 100755 --- 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 f199b0bc..fed7ae28 100755 --- 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 2ef8b920..11c7fd7c 100755 --- 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 6e4ed89b..08b80882 100755 --- 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 48770471..6c04edfd 100755 --- 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 aea1e3e2..2faf1d2a 100755 --- 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 d4af17e7..3ab95dbb 100755 --- 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 1b8b4db1..94df3700 100755 --- 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 b861ef93..3e512948 100755 --- 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 9d670138..5f8637fa 100755 --- 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 49cf1847..95d4b68b 100755 --- 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 5e5c1cef..75d1dcd1 100755 --- 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 f14208cd..3761d2c0 100755 --- 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 89f0bc6b..305d514e 100755 --- 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 d977a392..2da81724 100755 --- 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 9816df1a..39b1b9cc 100755 --- 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 6611b834..5b07f191 100755 --- 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 01a2175c..7e83886c 100755 --- 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 47aefcd9..def0654f 100755 --- 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 060f8d49..2e03e74f 100755 --- 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 1da10e2a..2866404d 100755 --- 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 c99aa407..8489e7f0 100755 --- 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 c41c0d26..c6de58d7 100755 --- 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 a4afdca2..fb26924d 100755 --- 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 f5e4e791..e07240ca 100755 --- 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 5e8031a3..e284bd63 100755 --- 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 1f14acae..c69cad83 100755 --- 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 76cfee27..893e0784 100755 --- 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 f2cfc29d..f9245b85 100755 --- 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 302f6a86..2d46f2f1 100755 --- 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 5b12f388..452d25d8 100755 --- 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 ee426790..74f0e2b5 100755 --- 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 d9f1d138..4348a8aa 100755 --- 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 0bbc8cd0..cb2370ab 100755 --- 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 532c2e6a..55862398 100755 --- 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 56694442..1ed5ca91 100755 --- 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 3dd07492..33f74eeb 100755 --- 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 9e71d86f..8bbb1cc3 100755 --- 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 cbfe66b3..2d073bda 100755 --- 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 c61c1690..9ee5b2d8 100755 --- 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 -- 2.43.5