summaryrefslogtreecommitdiff
path: root/m4
Commit message (Collapse)AuthorAgeFilesLines
* Remove ancient backward compatibility code from m4/m4.m4.Zack Weinberg2022-07-101-10/+3
| | | | | | | | | We have had AC_PREREQ([2.69]) in our own configure.ac since 2021, and before that it was AC_PREREQ([2.62]) since 2012, so backcompat code for 2.61 is not necessary anymore. Also add logging of the name of each candidate executable and bump the serial number.
* make fetchZack Weinberg2022-07-101-1/+1
| | | | | Our local patches to lib/Autom4te/FileUtils.pm and maint.mk were manually reapplied.
* Require Perl 5.10.0 or later.Zack Weinberg2022-07-101-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The minimum Perl version was raised to 5.8.0 from 5.6.0 in commit 3a9802d60156809c139e9b4620bf04917e143ee2 (but not documented as such until e8c2d79ec42c70b6e4fa282bc0c024bf42f0585f, and not actually *enforced* by our own configure script until, er, now) in order to use Time::HiRes::stat. Unfortunately, while the Time::HiRes *module* was added in 5.8.0, it did not export a ‘stat’ function until 5.8.9. More precisely, this feature was added to Time::HiRes in version 1.92 of that module; Perl core 5.8.8 shipped Time::HiRes 1.86, 5.8.9 shipped 1.9715. The only system I have convenient access to, that has older Perls installed, offers me a choice of 5.8.8 or 5.10.1, so the new requirement means I cannot test with 5.8.x anymore. Per https://perldoc.perl.org/perlhist the release history of these versions of Perl is, in chronological order, 5.8.0 2002-Jul-18 5.8.8 2006-Jan-31 5.10.0 2007-Dec-18 5.8.9 2008-Dec-14 <-- almost a year later than 5.10.0 5.10.1 2009-Aug-22 5.12.0 2010-Apr-12 Per https://perldoc.perl.org/perl5101delta the differences between 5.10.0 and 5.10.1 are small, and do not make me worry about accidentally introducing code that works on my test boxes but not for our users, unlike the gulf between 5.8.x and 5.10.x. Requiring 5.10 will mean that we have access to Digest::SHA, the // and //= operators, the regexp \K escape, and ‘state’ variables (lexical scope, persistent value) all of which I can think of uses for (but none of them are actually used in this patch). Putting it all together, I think a requirement bump to version 5.10.0 is justified. We are already chopping off the trailing edge at 2006 due to the requirement for M4 1.4.8 (/de facto/ since 2.70) and late 2007 is still 15 years ago. This patch also makes configure search $PATH for executables named ‘perl5*’ and ‘perl-5.*’ if bare ‘perl’ is too old. To do this, it introduces a helper macro AClocal_PATH_PROG_GLOBS_FEATURE_CHECK, which I would *like* to promote to a new Autoconf feature, but I got stuck on quoting issues — see comments in m4/perl-time-hires.m4. * NEWS: Document requirement for Perl 5.10. * m4/perl-time-hires.m4: New file. * configure.ac: Use AC_PATH_PERL_WITH_TIME_HIRES_STAT to probe for perl. * build-aux/fetch.pl (fetch): For .pm files fetched from Automake, rewrite “use 5.006” to “use 5.010”. * build-aux/help-extract.pl * lib/Autom4te/C4che.pm * lib/Autom4te/ChannelDefs.pm * lib/Autom4te/Channels.pm * lib/Autom4te/Config.pm * lib/Autom4te/Configure_ac.pm * lib/Autom4te/FileUtils.pm * lib/Autom4te/General.pm * lib/Autom4te/Getopt.pm * lib/Autom4te/Request.pm * lib/Autom4te/XFile.pm * tests/mktests.pl: Change “use 5.006” to “use 5.010”.
* Require GNU M4 1.4.8 or later.Zack Weinberg2022-07-061-3/+11
| | | | | | | | | | | | | | | | | | | | | | | The former minimum version was 1.4.6. 1.4.6 and 1.4.7 do not track the original location of text fed to ‘m4wrap’, which breaks autom4te’s ability to trace macros invoked from _AC_FINALIZE. Right now, the only _user_ visible effect of this is that autoconf running on M4 1.4.6 or 1.4.7 will emit an internal error, instead of the intended warning message, when it processes a configure.ac that neglects to invoke AC_INIT or AC_OUTPUT. Perhaps more importantly, it causes a bunch of scary-sounding failures in our own testsuite, which deliberately doesn’t use AC_OUTPUT sometimes. M4 1.4.6 and 1.4.7 also have bugs in location tracking of macro invocations spread over multiple lines, which, guess what, causes even more testsuite failures. 1.4.8 came out in 2006. As a practical matter, this change to our requirements means that people using macOS *to run autoconf* (not just to run generated configure scripts) cannot use the system-provided m4 anymore. {Free,Net,Open}BSD already don’t ship GNU M4 as their system m4, so users of those OSes should not be affected.
* make update-copyrightPaul Eggert2022-05-192-2/+2
|
* make fetchZack Weinberg2021-01-281-1/+1
|
* make update-copyrightZack Weinberg2021-01-282-2/+3
|
* make fetchZack Weinberg2020-09-031-2/+2
|
* make fetchPaul Eggert2020-06-291-1/+1
|
* maint: make update-copyrightJim Meyering2020-01-012-2/+2
|
* Prefer HTTPS to FTP and HTTPPaul Eggert2017-09-161-2/+2
|
* make fetchPaul Eggert2017-09-161-1/+1
|
* maint: update copyright dates for 2017Jim Meyering2017-01-012-2/+2
| | | | | * all files: Run "make update-copyright". * doc/autoconf.texi: Update manually.
* maint: make update-copyrightPaul Eggert2016-02-062-2/+2
|
* make fetchPaul Eggert2016-02-061-1/+1
|
* maint: bump copyright to 2015Paul Eggert2015-01-022-2/+2
| | | | * all files: Run 'make update-copyright'.
* maint: bump copyright to 2014Eric Blake2014-01-012-2/+2
| | | | | | | Done via 'make update-copyright', since all files are effectively modified and distributed this year via public version control. * all files: Update copyright year.
* maint: resync files from upstreamEric Blake2013-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | 'make syntax-check' complained about something that was already fixed upstream in doc/standards.texi, so I ran 'make update', and omitted lib/Autom4te as that still has some issues to be sorted out. * GNUmakefile: Resync from upstream. * build-aux/announce-gen: Likewise. * build-aux/config.guess: Likewise. * build-aux/config.sub: Likewise. * build-aux/git-version-gen: Likewise. * build-aux/gitlog-to-changelog: Likewise. * build-aux/gnupload: Likewise. * build-aux/move-if-change: Likewise. * build-aux/texinfo.tex: Likewise. * build-aux/update-copyright: Likewise. * build-aux/useless-if-before-free: Likewise. * build-aux/vc-list-files: Likewise. * doc/gendocs_template: Likewise. * doc/standards.texi: Likewise. * m4/autobuild.m4: Likewise. * maint.mk: Likewise.
* maint: bump copyright to 2013Eric Blake2013-01-032-2/+2
| | | | | | | Done via 'make update-copyright', since all files are effectively modified and distributed this year via public version control. * all files: Update copyright year.
* build: quote 'like this', not `like this'Stefano Lattarini2012-09-211-1/+1
| | | | | | | | | As per updated GCS recommendations. * Makefile.am, configure.ac, lib/m4sugar/Makefile.am, tests/Makefile.am, m4/m4.m4: Here. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* maint: sync files from gnulibStefano Lattarini2012-01-211-1/+1
| | | | | | | | | | | | | | | | * GNUmakefile: Sync from gnulib. * build-aux/announce-gen: Likewise. * build-aux/config.guess: Likewise. * build-aux/config.sub: Likewise. * build-aux/git-version-gen: Likewise. * build-aux/gnupload: Likewise. * build-aux/move-if-change: Likewise. * build-aux/texinfo.tex: Likewise. * build-aux/update-copyright: Likewise. * build-aux/vc-list-files: Likewise. * doc/gendocs_template: Likewise. * doc/standards.texi: Likewise. * m4/autobuild.m4: Likewise.
* maint: update copyright yearPaul Eggert2012-01-042-2/+2
| | | | All files changed to add 2012, via 'make update-copyright'.
* maint: resync upstream filesPaul Eggert2012-01-041-2/+1
| | | | | | | | | | * ChangeLog, GNUmakefile, build-aux/announce-gen: * build-aux/config.guess, build-aux/config.sub, build-aux/gendocs.sh: * build-aux/git-version-gen, build-aux/move-if-change: * build-aux/texinfo.tex, build-aux/update-copyright: * build-aux/vc-list-files, doc/fdl.texi, doc/gendocs_template: * doc/standards.texi, lib/Autom4te/XFile.pm, m4/autobuild.m4: Regenerated by 'make fetch'.
* build: exclude M4 with buggy strstrRalf Wildenhues2011-03-051-2/+12
| | | | | | | | * m4/m4.m4 (AC_PROG_GNU_M4): When searching PATH, do not accept an m4 that has either the gnulib strstr bug, or the glibc/gnulib strstr bug. Signed-off-by: Eric Blake <eblake@redhat.com>
* maint: update copyright yearEric Blake2011-01-042-3/+2
| | | | | | All files changed to add 2011, via 'make update-copyright'. Signed-off-by: Eric Blake <eblake@redhat.com>
* build: support autobuildEric Blake2010-09-171-0/+40
| | | | | | | | | | | | | | | | * cfg.mk (gnulib-update): Add autobuild.m4. * configure.ac (AB_INIT): Output autobuild header. * m4/autobuild.m4: New file, from gnulib. * build-aux/config.guess: Resync from upstream. * build-aux/config.sub: Likewise. * build-aux/texinfo.tex: Likewise. * doc/fdl.texi: Likewise. * doc/gnu-oids.texi: Likewise. * doc/make-stds.texi: Likewise. * doc/standards.texi: Likewise. * build-aux/gendocs.sh: Likewise. Signed-off-by: Eric Blake <eblake@redhat.com>
* Error and warning message formatting cleanups.Ralf Wildenhues2010-04-261-2/+2
| | | | | | | | | | | | | | | | | * doc/autoconf.texi (Autoconf Language, Generic Structures): Do not capitalize the first word in error messages, do not end them with a period. * lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS, AC_MSG_FAILURE): Likewise. * lib/autoconf/status.m4 (_AC_OUTPUT_FILE): Likewise. * lib/autotest/general.m4 (AT_INIT, at_fn_group_prepare): Likewise. * m4/m4.m4 (AC_PROG_GNU_M4): Likewise. * tests/base.at (AC_TRY_COMMAND): Likewise. * tests/torture.at (datarootdir workaround): Adjust expected message. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Recommend latest m4 release.Eric Blake2010-02-261-2/+2
| | | | | | | | | * README: Bump recommendation to m4 1.4.14 (minimum remains 1.4.6). * doc/autoconf.texi (Introduction): Likewise. * m4/m4.m4 (AC_PROG_GNU_M4): Likewise. Signed-off-by: Eric Blake <eblake@redhat.com>
* Update copyright year.Eric Blake2010-01-052-3/+3
| | | | | | All files changed to add 2010, via 'make update-copyright'. Signed-off-by: Eric Blake <ebb9@byu.net>
* Bump m4.m4 serial number.Paolo Bonzini2009-11-271-1/+1
| | | | * m4/m4: Bump serial number to 10.
* Fix m4 detection test on dash.Harald van Dijk2009-11-271-1/+1
| | | | * m4/m4 (AC_PROG_GNU_M4): Use AS_ECHO.
* Require m4 1.4.6, and fix testsuite to support this version.Eric Blake2009-07-251-8/+10
| | | | | | | | | | | | | | | * m4/m4.m4 (AC_PROG_GNU_M4): Reject m4 1.4.5, now that we use regexp it can't handle. * NEWS: Mention minimum version bump. * README: Likewise. * README-hacking: Likewise. * doc/autoconf.texi (Introduction, Why GNU M4): Likewise. * tests/tools.at (autom4te --trace and whitespace): Update test so still work with older m4 line numbers. * tests/m4sugar.at (m4@&t@_require: nested): Likewise. Reported by Ralf Wildenhues. Signed-off-by: Eric Blake <ebb9@byu.net>
* Fix nits in recent patches.Eric Blake2009-07-131-4/+5
| | | | | | | | | | | | | * configure.ac (ac_cv_dir_trailing_space): Avoid $status, for zsh. * doc/autoconf.texi (Writing Testsuites) <AT_FAIL_IF, AT_SKIP_IF>: Tweak wording. (Introduction): Recommend m4 1.4.13. * README: Likewise. * m4/m4.m4 (AC_PROG_GNU_M4): Likewise. Use long option --gnu rather than -g. Signed-off-by: Eric Blake <ebb9@byu.net>
* use m4 -g when availablePaolo Bonzini2009-07-131-1/+21
| | | | | | | | | | M4sugar requires GNU m4 extensions to be enabled. Override POSIXLY_CORRECT using -g. * m4/m4.m4: Unset POSIXLY_CORRECT during first test. Test for -g. Warn user if he has POSIXLY_CORRECT set but -g is not supported. * bin/Makefile.am: Substitute @M4_GNU@ into generated files. * bin/autom4te.in: Pass @M4_GNU@ to m4.
* revert previous pushPaolo Bonzini2009-07-131-11/+0
|
* use m4 -g when availablePaolo Bonzini2009-07-131-0/+11
| | | | | | | | | | | M4sugar requires GNU m4 extensions to be enabled. Override POSIXLY_CORRECT using -g. 2009-07-12 Paolo Bonzini <bonzini@gnu.org> * m4/m4.m4: Test for -g. * bin/Makefile.am: Substitute @M4_GNU@ into generated files. * bin/autom4te.in: Pass @M4_GNU@ to m4.
* Update uses of all-permissive license.Eric Blake2009-05-202-10/+17
| | | | | | | | | | | | | | | | | | | | | | | * ChangeLog: Relicense under GPL. * ChangeLog.0: Likewise. * ChangeLog.1: Likewise. * ChangeLog.2: Likewise. * THANKS: Likewise. * m4/m4.m4: Use latest wording of FSF all-permissive license. * m4/make-case.m4: Likewise. * doc/install.texi: Likewise. * tests/statesave.m4: Relicense to match rest of testsuite; this file does not need all-permissive license since it is not designed for reuse by other packages. * BUGS: Relicense under all-permissive license. * HACKING: Likewise. * NEWS: Likewise. * README: Likewise. * README-alpha: Likewise. * README-hacking: Likewise. * TODO: Likewise. Signed-off-by: Eric Blake <ebb9@byu.net>
* Check for case sensitive make.Stepan Kasal2008-08-261-0/+26
| | | | | | | | | | * m4/make-check.m4 (AC_PROG_MAKE_CASE_SENSITIVE): New macro,... * configure.ac: ... called here. * Makefile.am ($(abs_srcdir)/INSTALL, INSTALL): Return to... ($(srcdir)/INSTALL): ...this, but enclose the rule in "if MAKE_CASE_SENSITIVE". Signed-off-by: Stepan Kasal <skasal@redhat.com>
* Recommend the just-released M4 1.4.11.Eric Blake2008-04-021-3/+3
| | | | | | | | | * NEWS: Update recommendation. * README: Likewise. * doc/autoconf.texi (Introduction): Likewise. * m4/m4.m4 (AC_PROG_GNU_M4): Likewise. Signed-off-by: Eric Blake <ebb9@byu.net>
* Reject FreeBSD m4.Eric Blake2007-10-171-4/+8
| | | | | | | | * m4/m4.m4 (AC_PROG_GNU_M4): Also check for frozen file support. * configure: Regenerate. Reported by Bob Friesenhahn. Signed-off-by: Eric Blake <ebb9@byu.net>
* Once again, reject IRIX m4.Eric Blake2007-10-011-1/+3
| | | | | | | | | * m4/m4.m4 (AC_PROG_GNU_M4): Use indir builtin to root out non-GNU implementations that ignore --trace. * configure: Regenerate. Reported by Ralf Wildenhues. Signed-off-by: Eric Blake <ebb9@byu.net>
* Improve M4 path searching during configure.Eric Blake2007-09-081-16/+25
| | | | | | | | | | | | | | | | | | | | | | | * lib/autoconf/programs.m4 (AC_PATH_PROGS_FEATURE_CHECK): New macro. (_AC_PATH_PROG_FEATURE_CHECK): Rename... (_AC_PATH_PROGS_FEATURE_CHECK): ...to this, add defaulted action parameter, and kill side effects. (_AC_PROG_GREP, AC_PROG_SED): Adjust callers. (_AC_FEATURE_CHECK_LENGTH): Kill extra whitespace. * m4/m4.m4 (AC_PROG_GNU_M4): Don't stop searching until working m4 is found. (AC_PATH_PROGS_FEATURE_CHECK): Add backwards compatibility hack to allow bootstrapping with autoconf 2.61. * configure.ac (M4): AC_PROG_GNU_M4 now exits on failure. * configure: Regenerate. * doc/autoconf.texi (Generic Programs): Document new macro. * tests/mktests.sh (au_exclude_script): Exclude auto-testing new macro. * tests/semantics.at (AC_PATH_PROGS_FEATURE_CHECK): New test. * NEWS: Document the change. * THANKS: Update. Reported by Hans Aberg.
* * m4/m4.m4 (AC_PROG_GNU_M4): Reject M4 1.4 through 1.4.4 asEric Blake2007-02-021-8/+10
| | | | | | | | | broken. * configure.ac: Update error message. * NEWS: Note that M4 1.4.5 or later is now a hard dependency. Reported by Gary Vaughan and Jim Meyering, and problem analyzed by Stepan Kasal: http://lists.gnu.org/archive/html/bug-autoconf/2006-11/msg00025.html
* * m4/m4.m4: Change copyright.Eric Blake2006-09-201-21/+10
| | | | | | | | | | | | | | | | * configure: Regenerate. * Makefile.in: Likewise. * bin/Makefile.in: Likewise. * doc/Makefile.in: Likewise. * lib/Makefile.in: Likewise. * lib/Autom4te/Makefile.in: Likewise. * lib/autoconf/Makefile.in: Likewise. * lib/autoscan/Makefile.in: Likewise. * lib/autotest/Makefile.in: Likewise. * lib/emacs/Makefile.in: Likewise. * lib/m4sugar/Makefile.in: Likewise. * man/Makefile.in: Likewise. * tests/Makefile.in: Likewise.
* * m4/m4.m4 (AC_PROG_GNU_M4): Check for m4 --debugfile support.Eric Blake2006-09-201-4/+15
| | | | | | * bin/Makefile.am (edit): Substitute M4_DEBUGFILE. * bin/autom4te.in (handle_m4): Favor --debugfile over misnamed --error-output, to avoid warnings with M4 2.0.
* Rework to use more-modern build style.Paul Eggert2006-08-241-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many files are renamed; all uses of their names were changed. * .x-sc_trailing_blank: Renamed from .x-sc_trailing_blank. * .x-sc_useless_cpp_parens: New file. * build-aux/config.guess: Renamed from config/config.guess. Update. * build-aux/config.sub: Renamed from config/config.sub. Update. * build-aux/elisp-comp: Renamed from config/elisp-comp. * build-aux/install-sh: Renamed from config/install-sh. Update. * build-aux/mdate-sh: Renamed from config/mdate-sh. * build-aux/missing: Renamed from config/missing. * build-aux/texinfo.tex: Renamed from config/texinfo.tex. Update. * build-aux/vc-list-files: Renamed from config/vc-list-files. * config/Makefile.am: Removed. * config/mkinstalldirs: Removed. * config/move-if-change: Removed. * m4/m4.m4: Renamed from config/m4.m4. Add (C) to copyright notice. * Makefile.am (SUBDIRS): Remove config. (ACLOCAL_AMFLAGS): Include from m4, not config. (EXTRA_DIST): Add config/announce-gen, config/prev-version.txt. (WGET, WGETFLAGS): New macros, since Makefile.maint no longer does this. (autom4te-update): Rewrite with a loop. Get from gnulib, not automake. Fail if there's an error. * Makefile.cfg (move_if_change): Remove. (wget_files): Remove. (cvs_executable_files): New macro. (cvs_files): Use it. Remove mkinstalldirs. Add fdl.texi. (executable-update): Use $(cvs_executable_files). (local-checks-to-skip): Remove. * Makefile.maint: Merge from coreutils, plus add our own changes (gzip_rsyncable): New macro. (GZIP_ENV): Use it. (CVS_LIST): Use build-aux/vc-list-files. (VERSION_REGEXP): New macro. (local-checks-available): Add patch-check, $(syntax-check-rules), check-AUTHORS. (syntax-check-rules): Compute dynamically. (sc_cast_of_x_alloc_return_value): Work even if no source files. (sc_cast_of_alloca_return_value): Likewise. (sc_prohibit_atoi_atof): Simplify regexp. (sc_no_if_have_config_h, sc_require_config_h): (sc_prohibit_assert_without_use, (sc_obsolete_symbols): Check for O_NDELAY. (sc_texi_notab): Remove. (sc-changelog): Don't make an exception for '----' lines. (.re-list): Remove, so we don't have a junk file behind. (sc_system_h_headers): Remove the need for .re-list. (sc_the_the): New rule. (sc_tight_scope): Simplify. (sc_trailing_space): Renamed from sc_trailing_blank. (longopt_re): New macro. (sc_two_space_separator_in_usage): New rule. (sc_unmarked_diagnostics): Look at all files under CVS. (sc_useless_cpp_parens, patch-check, check-AUTHORS): New rules. (news-date-check, changelog-check): Version is OK. (po-check): Look for lib files even if not in CVS. (copyright-check): Use $() not ``. (maintainer-distcheck): Do not depend on changelog-check. (my-distcheck): Depend on $(release_archive_dir)/$(prev-tgz). Also check for -Wpointer-arith. (WGET, WGETFLAGS, tgz-md5, tgz-sha1, bz2-md5, bz2-sha1): (xdelta-md5, xdelta-sha1, tgz-size, bz2-size, xd-size, rel-check): Remove. (announcement): Add --gpg-key-id arg. (cvs-sv): Remove. (move_if_change): Just use mv. (local_updates: Remove wget-update, po-update. (po_repo, do-po-update, po-update, wget_files, get-targets): Remove. (config.guess-url_prefix, config.sub-url_prefix): Remove. (ansi2knr.c-url_prefix, texinfo.tex-url_prefix): (standards.texi-url_prefix, make-stds.texi-url_prefix, target, url): ($(get-targets)): Remove. (cvs_files): Remove missing, mkinstalldirs, ansi2knr.c. (gnulib_repo): Renamed from automake_repo. Get from gnulib now. (cvs-update): Get from gnulib. (emut_upload_commands): gnupload is in build-aux now. (alpha beta major): Add changelog-check. Check version. * configure.ac (AC_CONFIG_AUX_DIR): Renamed from config to build-aux. (AC_CONFIG_FILES): Remove. * bin/autoconf.as: Add spaces to avoid distcheck warning. * config/announce-gen: Sync from coreutils. * doc/make-stds.texi: Sync from gnulib. * doc/standards.texi: Likewise. * man/Makefile.am: Adjust for config -> build-aux renaming. * tests/Makefile.am: Prefer $(FOO) to @FOO@. * tests/local.at: Adjust from config -> build-aux renaming. * tests/tools.at: Likewise. * tests/torture.at: Likewise.
* * m4/: Remove, merged into...Akim Demaille2001-10-2413-834/+0
| | | | * config/: here.
* * Makefile.am, config/Makefile.am, lib/emacs/Makefile.am,Akim Demaille2001-10-052-4/+16
| | | | * m4/Makefile.am, man/Makefile.am: Add/adjust MAINTAINERCLEANFILES.
* * lib/emacs/autoconf-mode.el, lib/emacs/autotest-mode.el: New.Akim Demaille2001-09-283-0/+51
| | | | * configure.ac: Adjust.
* * m4/auxdir.m4, m4/cond.m4, m4/depend.m4, m4/init.m4, m4/install-sh.m4,Tim Van Holder2001-09-238-63/+138
| | | | | m4/missing.m4, m4/sanity.m4, m4/strip.m4: Updated to match current versions from CVS Automake.