Index: automake/ChangeLog diff -c automake/ChangeLog:1.676.4.26 automake/ChangeLog:1.676.4.30 *** automake/ChangeLog:1.676.4.26 Thu Jun 7 13:03:50 2001 --- automake/ChangeLog Sun Jun 10 03:32:49 2001 *************** *** 1,4 **** --- 1,41 ---- + 2001-06-10 Gary V. Vaughan + + Automake 1.4-p4 was released. + + * NEWS: Updated. + * config.sub: Updated from master copy at GNU -- config.guess + has not changed since the last release. + * configure.in (AM_INIT_AUTOMAKE): Set the fork identifier to + patch level 3, 1.4-p4. + * stamp-vti: Regenerated. + * version.texi: Ditto. + * configure: Ditto. + + From Masaki WAKABAYASHI : + * automake.in: Substitute $configure_ac for @CONFIGURE_AC@ + while writing Makefile.in. + * empty.test: Ditto. + * remake-hdr.am: Use @CONFIGURE_AC@ instead of hardcoding + configure.in. + * remake.am: Ditto. + * texi-vers.am: Ditto. + + 2001-06-08 Tom Tromey + + * tests/version4.test: New file. + * automake.in (version_check): New sub. + (handle_options): Use it. + * tests/Makefile.am (AUTOMAKE_OPTIONS): Removed. + (TESTS): Added version4.test. + * m4/Makefile.am (AUTOMAKE_OPTIONS): Removed. + * Makefile.am (AUTOMAKE_OPTIONS): Remove `gnits'. + 2001-06-07 Gary V. Vaughan + + * configure.in (AM_INIT_AUTOMAKE): Bumped the version number to + 1.4-p3a. + + Automake 1.4-p3 was released. * configure.in (AM_INIT_AUTOMAKE): Set the fork identifier to patch level 3, 1.4-p3. Index: automake/Makefile.am diff -c automake/Makefile.am:1.126.4.2 automake/Makefile.am:1.126.4.3 *** automake/Makefile.am:1.126.4.2 Thu Jun 7 12:39:27 2001 --- automake/Makefile.am Sat Jun 9 06:04:23 2001 *************** *** 1,6 **** ## Process this file with automake to create Makefile.in ! AUTOMAKE_OPTIONS = gnits 1.4 MAINT_CHARSET = latin1 ## We need `.' in SUBDIRS because we want `check' to build `.' before --- 1,6 ---- ## Process this file with automake to create Makefile.in ! AUTOMAKE_OPTIONS = 1.4 MAINT_CHARSET = latin1 ## We need `.' in SUBDIRS because we want `check' to build `.' before Index: automake/Makefile.in diff -c automake/Makefile.in:1.217.4.6 automake/Makefile.in:1.217.4.7 *** automake/Makefile.in:1.217.4.6 Thu Jun 7 12:39:27 2001 --- automake/Makefile.in Sat Jun 9 06:04:23 2001 *************** *** 63,69 **** TAR = @TAR@ VERSION = @VERSION@ ! AUTOMAKE_OPTIONS = gnits 1.4 MAINT_CHARSET = latin1 SUBDIRS = . m4 tests --- 63,69 ---- TAR = @TAR@ VERSION = @VERSION@ ! AUTOMAKE_OPTIONS = 1.4 MAINT_CHARSET = latin1 SUBDIRS = . m4 tests Index: automake/NEWS diff -c automake/NEWS:1.130.4.3 automake/NEWS:1.130.4.4 *** automake/NEWS:1.130.4.3 Thu Jun 7 12:31:07 2001 --- automake/NEWS Sun Jun 10 03:32:50 2001 *************** *** 1,3 **** --- 1,8 ---- + New in 1.4-p4: + * Deal with configure.ac as well as configure.in -- this time for real! + * The version numbering system now allows three point version numbers, + such as 1.4.4, without thinking they are alpha release numbers. + New in 1.4-p3: * Deal with configure.ac as well as configure.in. * Don't complain if `version.texi' is included in multiple places. Index: automake/automake.in diff -c automake/automake.in:1.644.4.10 automake/automake.in:1.644.4.12 *** automake/automake.in:1.644.4.10 Thu Jun 7 12:31:07 2001 --- automake/automake.in Sun Jun 10 03:19:35 2001 *************** *** 692,697 **** --- 692,760 ---- ################################################################ + # A helper which handles the logic of requiring a version number in + # AUTOMAKE_OPTIONS. Return 1 on error, 0 on success. + sub version_check ($$$$) + { + my ($rmajor, $rminor, $ralpha, $rfork) = ($1, $2, $3, $4); + + &prog_error ("version is incorrect: $VERSION") + if $VERSION !~ /(\d+)\.(\d+)([a-z]?)-?([A-Za-z0-9]+)?/; + + my ($tmajor, $tminor, $talpha, $tfork) = ($1, $2, $3, $4); + + $rfork ||= ''; + $tfork ||= ''; + + my $rminorminor = 0; + my $tminorminor = 0; + + # Some versions were labelled like `1.4-p3a'. This is the same as + # an alpha release labelled `1.4.3a'. However, a version like + # `1.4g' is the same as `1.4.99g'. Yes, this sucks. Moral: + # always listen to the users. + if ($rfork =~ /p([0-9]+)([a-z]?)/) + { + $rminorminor = $1; + # `1.4a-p3b' never existed. But we'll accept it anyway. + $ralpha = $ralpha || $2 || ''; + $rfork = ''; + } + if ($tfork =~ /p([0-9]+)([a-z]?)/) + { + $tminorminor = $1; + # `1.4a-p3b' never existed. But we'll accept it anyway. + $talpha = $talpha || $2 || ''; + $tfork = ''; + } + + $rminorminor = 99 if $ralpha ne '' && $rminorminor == 0; + $tminorminor = 99 if $talpha ne '' && $tminorminor == 0; + + # 2.0 is better than 1.0. + # 1.2 is better than 1.1. + # 1.2a is better than 1.2. + # If we require 3.4n-foo then we require something + # >= 3.4n, with the `foo' fork identifier. + # The $r* variables are what the user specified. + # The $t* variables denote automake itself. + if ($rmajor > $tmajor + || ($rmajor == $tmajor && $rminor > $tminor) + || ($rminor == $tminor && $rminor == $tminor + && $rminorminor > $tminorminor) + || ($rminor == $tminor && $rminor == $tminor + && $rminorminor == $tminorminor + && $ralpha gt $talpha) + || ($rfork ne '' && $rfork ne $tfork)) + { + &am_line_error ('AUTOMAKE_OPTIONS', + "require version $_, but have $VERSION"); + return 1; + } + + return 0; + } + # Handle AUTOMAKE_OPTIONS variable. Return 1 on error, 0 otherwise. sub handle_options { *************** *** 732,765 **** { # Got a version number. ! local ($rmajor, $rminor, $ralpha, $rfork) = ($1, $2, $3, $4); ! ! if ($VERSION !~ /([0-9]+)\.([0-9]+)([a-z]?)(-[A-Za-z0-9]+)?/) ! { ! print STDERR ! "automake: programming error: version is incorrect\n"; ! exit 1; } - local ($tmajor, $tminor, $talpha, $tfork) = ($1, $2, $3, $4); - - $rfork ||= ''; - $tfork ||= ''; - - # 2.0 is better than 1.0. - # 1.2 is better than 1.1. - # 1.2a is better than 1.2. - # If we require 3.4n-foo then we require something - # >= 3.4n, with the `foo' fork identifier. - if ($rmajor > $tmajor - || ($rmajor == $tmajor && $rminor > $tminor) - || ($rminor == $tminor && $rminor == $tminor - && $ralpha gt $talpha) - || ($rfork ne '' && $rfork ne $tfork)) - { - &am_line_error ('AUTOMAKE_OPTIONS', - "require version $_, but have $VERSION"); - return 1; - } } else { --- 795,804 ---- { # Got a version number. ! if (version_check ($1, $2, $3, $4)) ! { ! return 1; } } else { *************** *** 1962,1968 **** ('s/\@TEXI\@/' . $info_cursor . '/g; ' . 's/\@VTI\@/' . $vti . '/g; ' . 's/\@VTEXI\@/' . $vtexi . '/g;' ! . 's,\@MDDIR\@,' . $conf_pat . ',g;', 'texi-vers') unless $done > 1; --- 2001,2008 ---- ('s/\@TEXI\@/' . $info_cursor . '/g; ' . 's/\@VTI\@/' . $vti . '/g; ' . 's/\@VTEXI\@/' . $vtexi . '/g;' ! . 's,\@MDDIR\@,' . $conf_pat . ',g;' ! . 's,\@CONFIGURE_AC\@,' . $configure_ac . ',g;', 'texi-vers') unless $done > 1; *************** *** 2998,3004 **** else { &handle_aclocal_m4; ! $output_rules .= &file_contents ('remake'); &examine_variable ('CONFIG_STATUS_DEPENDENCIES'); &examine_variable ('CONFIGURE_DEPENDENCIES'); $top_reldir = ''; --- 3038,3047 ---- else { &handle_aclocal_m4; ! $output_rules .= &file_contents_with_transform ('s,\@CONFIGURE_AC\@,' ! . $configure_ac ! . ',;', ! 'remake'); &examine_variable ('CONFIG_STATUS_DEPENDENCIES'); &examine_variable ('CONFIGURE_DEPENDENCIES'); $top_reldir = ''; *************** *** 3124,3130 **** $xform .= 's,\@CONFIG_HEADER_IN\@,' . "${ch_sans_dir}" . ',;'; $xform .= 's,\@CONFIG_HEADER_FULL\@,' . "${one_fullname}" . ',;'; $xform .= 's,\@STAMP\@,' . "${stamp_dir}${stamp_name}" . ',;'; ! $output_rules .= &file_contents_with_transform ($xform, 'remake-hdr'); --- 3167,3174 ---- $xform .= 's,\@CONFIG_HEADER_IN\@,' . "${ch_sans_dir}" . ',;'; $xform .= 's,\@CONFIG_HEADER_FULL\@,' . "${one_fullname}" . ',;'; $xform .= 's,\@STAMP\@,' . "${stamp_dir}${stamp_name}" . ',;'; ! $xform .= 's,\@CONFIGURE_AC\@,' . "${configure_ac}" . ',;'; ! $output_rules .= &file_contents_with_transform ($xform, 'remake-hdr'); Index: automake/config.sub diff -c automake/config.sub:1.149.8.3 automake/config.sub:1.149.8.4 *** automake/config.sub:1.149.8.3 Thu Jun 7 12:48:51 2001 --- automake/config.sub Sun Jun 10 03:32:50 2001 *************** *** 3,9 **** # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. ! timestamp='2001-05-30' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software --- 3,9 ---- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. ! timestamp='2001-06-08' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software *************** *** 157,162 **** --- 157,170 ---- os=-vxworks basic_machine=$1 ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; *************** *** 1022,1027 **** --- 1030,1036 ---- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ Index: automake/configure diff -c automake/configure:1.62.4.6 automake/configure:1.62.4.8 *** automake/configure:1.62.4.6 Thu Jun 7 13:03:51 2001 --- automake/configure Sun Jun 10 03:32:50 2001 *************** *** 692,698 **** PACKAGE=automake ! VERSION=1.4-p3 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } --- 692,698 ---- PACKAGE=automake ! VERSION=1.4-p4 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } Index: automake/configure.in diff -c automake/configure.in:1.67.4.6 automake/configure.in:1.67.4.8 *** automake/configure.in:1.67.4.6 Thu Jun 7 13:03:51 2001 --- automake/configure.in Sun Jun 10 03:32:50 2001 *************** *** 1,7 **** dnl Process this file with autoconf to produce a configure script. AC_INIT(automake.in) ! AM_INIT_AUTOMAKE(automake, 1.4-p3) # Find an appropriate tar for use in "dist" targets. A "best guess" # is good enough -- if we can't find GNU tar, we don't really care. --- 1,7 ---- dnl Process this file with autoconf to produce a configure script. AC_INIT(automake.in) ! AM_INIT_AUTOMAKE(automake, 1.4-p4) # Find an appropriate tar for use in "dist" targets. A "best guess" # is good enough -- if we can't find GNU tar, we don't really care. Index: automake/remake-hdr.am diff -c automake/remake-hdr.am:1.26 automake/remake-hdr.am:1.26.6.1 *** automake/remake-hdr.am:1.26 Mon Jan 11 05:46:49 1999 --- automake/remake-hdr.am Sun Jun 10 03:19:37 2001 *************** *** 36,42 **** rm -f $(srcdir)/@STAMP@.in; \ $(MAKE) $(srcdir)/@STAMP@.in; \ else :; fi ! $(srcdir)/@STAMP@.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) @FILES@ cd $(top_srcdir) && $(AUTOHEADER) ## We used to try to get a real timestamp here. But the fear is that ## that will cause unnecessary cvs conflicts --- 36,42 ---- rm -f $(srcdir)/@STAMP@.in; \ $(MAKE) $(srcdir)/@STAMP@.in; \ else :; fi ! $(srcdir)/@STAMP@.in: $(top_srcdir)/@CONFIGURE_AC@ $(ACLOCAL_M4) @FILES@ cd $(top_srcdir) && $(AUTOHEADER) ## We used to try to get a real timestamp here. But the fear is that ## that will cause unnecessary cvs conflicts Index: automake/remake.am diff -c automake/remake.am:1.23 automake/remake.am:1.23.8.1 *** automake/remake.am:1.23 Sat Oct 3 11:26:51 1998 --- automake/remake.am Sun Jun 10 03:19:37 2001 *************** *** 17,24 **** ## 02111-1307, USA. ## Explicitly look in srcdir for benefit of non-GNU makes. ! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ## Explicitly look in srcdir for benefit of non-GNU makes. ! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) --- 17,24 ---- ## 02111-1307, USA. ## Explicitly look in srcdir for benefit of non-GNU makes. ! config.status: $(srcdir)/@CONFIGURE_AC@ $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ## Explicitly look in srcdir for benefit of non-GNU makes. ! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/@CONFIGURE_AC@ $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) Index: automake/stamp-vti diff -c automake/stamp-vti:1.68.4.6 automake/stamp-vti:1.68.4.8 *** automake/stamp-vti:1.68.4.6 Thu Jun 7 13:03:51 2001 --- automake/stamp-vti Sun Jun 10 03:32:50 2001 *************** *** 1,3 **** @set UPDATED 6 January 1999 ! @set EDITION 1.4-p3 ! @set VERSION 1.4-p3 --- 1,3 ---- @set UPDATED 6 January 1999 ! @set EDITION 1.4-p4 ! @set VERSION 1.4-p4 Index: automake/texi-vers.am diff -c automake/texi-vers.am:1.11 automake/texi-vers.am:1.11.8.1 *** automake/texi-vers.am:1.11 Thu Jan 14 09:54:37 1999 --- automake/texi-vers.am Sun Jun 10 03:19:37 2001 *************** *** 18,26 **** $(srcdir)/@VTEXI@: @MAINTAINER_MODE_TRUE@stamp-@VTI@ @: ! ## Depend on configure.in so that version number updates cause a ## rebuild. ! $(srcdir)/stamp-@VTI@: @TEXI@ $(top_srcdir)/configure.in @echo "@set UPDATED `$(SHELL) @MDDIR@mdate-sh $(srcdir)/@TEXI@`" > @VTI@.tmp @echo "@set EDITION $(VERSION)" >> @VTI@.tmp @echo "@set VERSION $(VERSION)" >> @VTI@.tmp --- 18,26 ---- $(srcdir)/@VTEXI@: @MAINTAINER_MODE_TRUE@stamp-@VTI@ @: ! ## Depend on configure.ac so that version number updates cause a ## rebuild. ! $(srcdir)/stamp-@VTI@: @TEXI@ $(top_srcdir)/@CONFIGURE_AC@ @echo "@set UPDATED `$(SHELL) @MDDIR@mdate-sh $(srcdir)/@TEXI@`" > @VTI@.tmp @echo "@set EDITION $(VERSION)" >> @VTI@.tmp @echo "@set VERSION $(VERSION)" >> @VTI@.tmp Index: automake/version.texi diff -c automake/version.texi:1.141.4.6 automake/version.texi:1.141.4.8 *** automake/version.texi:1.141.4.6 Thu Jun 7 13:03:51 2001 --- automake/version.texi Sun Jun 10 03:32:50 2001 *************** *** 1,3 **** @set UPDATED 6 January 1999 ! @set EDITION 1.4-p3 ! @set VERSION 1.4-p3 --- 1,3 ---- @set UPDATED 6 January 1999 ! @set EDITION 1.4-p4 ! @set VERSION 1.4-p4 Index: automake/m4/Makefile.am diff -c automake/m4/Makefile.am:1.23 automake/m4/Makefile.am:1.23.6.1 *** automake/m4/Makefile.am:1.23 Tue Oct 27 15:49:09 1998 --- automake/m4/Makefile.am Sat Jun 9 06:04:24 2001 *************** *** 1,6 **** ## Process this file with automake to create Makefile.in - AUTOMAKE_OPTIONS = gnits MAINT_CHARSET = latin1 m4datadir = $(datadir)/aclocal --- 1,5 ---- Index: automake/m4/Makefile.in diff -c automake/m4/Makefile.in:1.85.4.2 automake/m4/Makefile.in:1.85.4.3 *** automake/m4/Makefile.in:1.85.4.2 Thu Jun 7 12:31:13 2001 --- automake/m4/Makefile.in Sat Jun 9 06:04:24 2001 *************** *** 63,69 **** TAR = @TAR@ VERSION = @VERSION@ - AUTOMAKE_OPTIONS = gnits MAINT_CHARSET = latin1 m4datadir = $(datadir)/aclocal --- 63,68 ---- Index: automake/tests/Makefile.am diff -c automake/tests/Makefile.am:1.170 automake/tests/Makefile.am:1.170.4.1 *** automake/tests/Makefile.am:1.170 Thu Jan 14 14:29:34 1999 --- automake/tests/Makefile.am Sat Jun 9 06:04:24 2001 *************** *** 1,7 **** ## Process this file with automake to create Makefile.in - AUTOMAKE_OPTIONS = gnits - TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test \ acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.test \ all.test alpha.test ammissing.test ansi.test ansi2.test ansi3.test \ --- 1,5 ---- *************** *** 38,45 **** subdir2.test subst.test symlink.test syntax.test tags.test tagsub.test \ target.test texinfo.test texinfo2.test texinfo3.test texinfo4.test \ texinfo5.test texinfo6.test texinfo7.test unused.test version.test \ ! version2.test version3.test vpath.test vtexi.test vtexi2.test \ ! whoami.test xsource.test yacc.test yaccpp.test EXTRA_DIST = defs $(TESTS) --- 36,43 ---- subdir2.test subst.test symlink.test syntax.test tags.test tagsub.test \ target.test texinfo.test texinfo2.test texinfo3.test texinfo4.test \ texinfo5.test texinfo6.test texinfo7.test unused.test version.test \ ! version2.test version3.test version4.test vpath.test vtexi.test \ ! vtexi2.test whoami.test xsource.test yacc.test yaccpp.test EXTRA_DIST = defs $(TESTS) Index: automake/tests/Makefile.in diff -c automake/tests/Makefile.in:1.225.4.2 automake/tests/Makefile.in:1.225.4.3 *** automake/tests/Makefile.in:1.225.4.2 Thu Jun 7 12:31:13 2001 --- automake/tests/Makefile.in Sat Jun 9 06:04:24 2001 *************** *** 63,71 **** TAR = @TAR@ VERSION = @VERSION@ ! AUTOMAKE_OPTIONS = gnits ! ! TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.test all.test alpha.test ammissing.test ansi.test ansi2.test ansi3.test auxdir.test backsl.test badline.test badprog.test block.test canon.test canon2.test canon3.test canon4.test checkall.test clean.test colneq.test colneq2.test colon.test colon2.test colon3.test colon4.test colon5.test colon6.test colon7.test comment.test comment2.test compile_f_c_cxx.test cond.test cond2.test cond3.test cond4.test cond5.test cond6.test cond7.test condman.test condman2.test conf2.test confdist.test confh.test confh2.test confh3.test config.test confincl.test confsub.test confvar.test confvar2.test cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test cxxo.test cygwin32.test defun.test defun2.test dejagnu.test depacl.test depacl2.test depend.test depend2.test depend3.test discover.test distdir.test dup.test dup2.test else.test empty.test error.test exdir.test exdir2.test exsource.test extra.test extra3.test extra4.test flibs.test fnoc.test fo.test fonly.test fpinst2.test fpinstall.test gnits.test implicit.test include.test info.test insh.test insh2.test install.test installsh.test instdata.test instexec.test insthook.test instman.test interp.test interp2.test java.test javaprim.test javasubst.test ldadd.test lex.test lex2.test libobj.test libobj2.test libobj3.test libobj4.test libobj5.test libobj6.test libobj7.test libobj8.test library.test link_c_cxx.test link_f_c.test link_f_c_cxx.test link_f_cxx.test link_f_only.test lisp.test mdate.test mdate2.test mdate3.test mkinst2.test mkinstall.test noinst.test number.test objc.test obsolete.test order.test outdir.test output.test output2.test output3.test output4.test output5.test package.test parse.test pluseq.test pluseq2.test pluseq3.test pluseq4.test pluseq5.test prefix.test primary.test primary2.test proginst.test ranlib.test recurs.test recurs2.test remake.test remake2.test req.test rulepat.test scripts.test seenc.test sinclude.test spell.test spell2.test spell3.test spelling.test stamph.test stdlib.test subdir.test subdir2.test subst.test symlink.test syntax.test tags.test tagsub.test target.test texinfo.test texinfo2.test texinfo3.test texinfo4.test texinfo5.test texinfo6.test texinfo7.test unused.test version.test version2.test version3.test vpath.test vtexi.test vtexi2.test whoami.test xsource.test yacc.test yaccpp.test EXTRA_DIST = defs $(TESTS) --- 63,69 ---- TAR = @TAR@ VERSION = @VERSION@ ! TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.test all.test alpha.test ammissing.test ansi.test ansi2.test ansi3.test auxdir.test backsl.test badline.test badprog.test block.test canon.test canon2.test canon3.test canon4.test checkall.test clean.test colneq.test colneq2.test colon.test colon2.test colon3.test colon4.test colon5.test colon6.test colon7.test comment.test comment2.test compile_f_c_cxx.test cond.test cond2.test cond3.test cond4.test cond5.test cond6.test cond7.test condman.test condman2.test conf2.test confdist.test confh.test confh2.test confh3.test config.test confincl.test confsub.test confvar.test confvar2.test cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test cxxo.test cygwin32.test defun.test defun2.test dejagnu.test depacl.test depacl2.test depend.test depend2.test depend3.test discover.test distdir.test dup.test dup2.test else.test empty.test error.test exdir.test exdir2.test exsource.test extra.test extra3.test extra4.test flibs.test fnoc.test fo.test fonly.test fpinst2.test fpinstall.test gnits.test implicit.test include.test info.test insh.test insh2.test install.test installsh.test instdata.test instexec.test insthook.test instman.test interp.test interp2.test java.test javaprim.test javasubst.test ldadd.test lex.test lex2.test libobj.test libobj2.test libobj3.test libobj4.test libobj5.test libobj6.test libobj7.test libobj8.test library.test link_c_cxx.test link_f_c.test link_f_c_cxx.test link_f_cxx.test link_f_only.test lisp.test mdate.test mdate2.test mdate3.test mkinst2.test mkinstall.test noinst.test number.test objc.test obsolete.test order.test outdir.test output.test output2.test output3.test output4.test output5.test package.test parse.test pluseq.test pluseq2.test pluseq3.test pluseq4.test pluseq5.test prefix.test primary.test primary2.test proginst.test ranlib.test recurs.test recurs2.test remake.test remake2.test req.test rulepat.test scripts.test seenc.test sinclude.test spell.test spell2.test spell3.test spelling.test stamph.test stdlib.test subdir.test subdir2.test subst.test symlink.test syntax.test tags.test tagsub.test target.test texinfo.test texinfo2.test texinfo3.test texinfo4.test texinfo5.test texinfo6.test texinfo7.test unused.test version.test version2.test version3.test version4.test vpath.test vtexi.test vtexi2.test whoami.test xsource.test yacc.test yaccpp.test EXTRA_DIST = defs $(TESTS) Index: automake/tests/empty.test diff -c automake/tests/empty.test:1.4 automake/tests/empty.test:1.4.8.1 *** automake/tests/empty.test:1.4 Sat Sep 26 11:32:28 1998 --- automake/tests/empty.test Sun Jun 10 03:19:38 2001 *************** *** 12,17 **** --- 12,18 ---- $AUTOMAKE || exit 1 # Create configure so Makefile doesn't look out-of-date. + echo frob > configure.ac echo frob > configure echo frob > config.status *************** *** 26,31 **** --- 27,33 ---- # Substitute variables we need. sed -e 's,@SHELL@,/bin/sh,g' -e 's/@srcdir@/./g' \ -e 's/@top_srcdir@/./g' -e 's/@datadir@/./g' \ + -e 's/@CONFIGURE_AC@/configure.ac/g' \ < Makefile.in > Makefile $MAKE install Index: automake/tests/version4.test diff -c /dev/null automake/tests/version4.test:1.1.2.1 *** /dev/null Sun Jun 10 03:35:49 2001 --- automake/tests/version4.test Sat Jun 9 06:15:18 2001 *************** *** 0 **** --- 1,11 ---- + #! /bin/sh + + # Test to make sure we are compatible with the 1.4-p1 series. + + . $srcdir/defs || exit 1 + + cat > Makefile.am << 'END' + AUTOMAKE_OPTIONS = 1.4-p3 + END + + $AUTOMAKE