* lib/Automake/Rule.pm (define): Suggest using target-local instead
of target-am, not target-am-local.
* tests/overrid.test: Check the diagnostic for clean-am.
Report from Bruno Haible.

.

Mark %MAKEFILE% as `.PRECIOUS'.

.

Require not only that `perl' have the executable
bit set, but also that it is not a directory.

* automake.in (ac_config_files_location): Declare as a hash.
(handle_configure): Rewrite the computation of AC_CONFIG_FILES
dependencies; make sure we don't use $(srcdir) or $(top_srcdir)
for inputs which are also outputs, and do not check inputs
relatively to the current directory.
(scan_autoconf_config_files): Take $where as argument, and
fill $ac_config_files_location.
* tests/output8.test, tests/output9.test: New files.
* tests/Makefile.am (TESTS): Add output8.test and output9.test.
Report from Bruno Haible.

* tests/aclibobj.test, tests/aclocal.test, tests/aclocal3.test,
tests/acoutbs.test, tests/acoutbs2.test, tests/acoutnoq.test,
tests/acoutpt.test, tests/acoutpt2.test, tests/acoutqnl.test,
tests/acsilent.test, tests/acsubst.test, tests/acsubst2.test,
tests/all.test, tests/alpha.test, tests/amassign.test,
tests/ammissing.test, tests/ansi.test, tests/ansi10.test,
tests/ansi2.test, tests/ansi3.test, tests/ansi3b.test,
tests/ansi4.test, tests/ansi5.test, tests/ansi6.test,
tests/ansi7.test, tests/ansi9.test, tests/ar.test,
tests/autohdr.test, tests/autohdr2.test, tests/auxdir.test,
tests/auxdir2.test, tests/backsl.test, tests/backsl2.test,
tests/badprog.test, tests/block.test, tests/canon2.test,
tests/canon3.test, tests/canon4.test, tests/canon5.test,
tests/ccnoco.test, tests/check.test, tests/check2.test,
tests/check3.test, tests/checkall.test, tests/clean.test,
tests/colneq2.test, tests/colon.test, tests/colon2.test,
tests/colon3.test, tests/colon4.test, tests/colon5.test,
tests/colon6.test, tests/colon7.test, tests/comment.test,
tests/comment2.test, tests/comment4.test, tests/comment6.test,
tests/comment7.test, tests/compile_f_c_cxx.test, tests/cond.test,
tests/cond10.test, tests/cond11.test, tests/cond13.test,
tests/cond14.test, tests/cond15.test, tests/cond16.test,
tests/cond17.test, tests/cond18.test, tests/cond19.test,
tests/cond21.test, tests/cond22.test, tests/cond25.test,
tests/cond26.test, tests/cond28.test, tests/cond3.test,
tests/cond4.test, tests/cond5.test, tests/cond6.test,
tests/cond7.test, tests/cond8.test, tests/cond9.test,
tests/condd.test, tests/condinc.test, tests/condlib.test,
tests/condman.test, tests/condman2.test, tests/conf2.test,
tests/confdeps.test, tests/confh.test, tests/confh4.test,
tests/config.test, tests/confincl.test, tests/conflnk.test,
tests/conflnk2.test, tests/confsub.test, tests/confvar.test,
tests/confvar2.test, tests/copy.test, tests/ctarget1.test,
tests/cxx.test, tests/cxxansi.test, tests/cxxcpp.test,
tests/cxxlibobj.test, tests/cxxlink.test, tests/cxxnoc.test,
tests/cxxo.test, tests/cygwin32.test, tests/dash.test,
tests/defun.test, tests/defun2.test, tests/dejagnu.test,
tests/dejagnu3.test, tests/dejagnu4.test, tests/dejagnu5.test,
tests/dejagnu6.test, tests/dejagnu7.test, tests/depacl2.test,
tests/depcomp.test, tests/depcomp2.test, tests/depcomp4.test,
tests/depdist.test, tests/depend.test, tests/depend2.test,
tests/depend3.test, tests/depend4.test, tests/destdir.test,
tests/dirlist.test, tests/discover.test, tests/distcom.test,
tests/distcom2.test, tests/distdir.test, tests/distname.test,
tests/dollar.test, tests/double.test, tests/dup2.test,
tests/empty.test, tests/empty2.test, tests/empty3.test,
tests/empty4.test, tests/error.test, tests/exdir.test,
tests/exeext.test, tests/exeext3.test, tests/exsource.test,
tests/ext.test, tests/ext2.test, tests/extra.test,
tests/extra2.test, tests/extra3.test, tests/extra4.test,
tests/extra5.test, tests/extra6.test, tests/extra7.test,
tests/flibs.test, tests/fnoc.test, tests/fo.test,
tests/fonly.test, tests/fortdep.test, tests/fpinst2.test,
tests/fpinstall.test, tests/gcj.test, tests/gcj3.test,
tests/gcj4.test, tests/gnits2.test, tests/gnits3.test,
tests/header.test, tests/implicit.test, tests/include.test,
tests/include2.test, tests/info.test, tests/insh2.test,
tests/install2.test, tests/installdir.test, tests/instdat.test,
tests/instdat2.test, tests/instexec.test, tests/insthook.test,
tests/instman.test, tests/instman2.test, tests/instsh.test,
tests/instsh2.test, tests/interp.test, tests/interp2.test,
tests/java.test, tests/java2.test, tests/javaprim.test,
tests/javasubst.test, tests/ldadd.test, tests/ldflags.test,
tests/lex.test, tests/lex3.test, tests/lex4.test, tests/lex5.test,
tests/libobj11.test, tests/libobj2.test, tests/libobj4.test,
tests/libobj5.test, tests/libobj7.test, tests/libobj8.test,
tests/library.test, tests/libtool.test, tests/libtool2.test,
tests/libtool3.test, tests/libtool5.test, tests/link_c_cxx.test,
tests/link_dist.test, tests/link_f_only.test, tests/link_fc.test,
tests/link_fccxx.test, tests/link_fcxx.test, tests/lisp.test,
tests/listval.test, tests/ltdeps.test, tests/ltlibobjs.test,
tests/maintclean.test, tests/make.test, tests/makej.test,
tests/makevars.test, tests/man.test, tests/man2.test,
tests/mclean.test, tests/mdate.test, tests/mdate2.test,
tests/mdate3.test, tests/mdate4.test, tests/mkinst2.test,
tests/mkinstall.test, tests/nobase.test, tests/nodef.test,
tests/nodef2.test, tests/nodep.test, tests/nodepcomp.test,
tests/nodist.test, tests/nodist2.test, tests/nodist3.test,
tests/noinst.test, tests/noinstdir.test, tests/nolink.test,
tests/nostdinc.test, tests/number.test, tests/obsolete.test,
tests/order.test, tests/outdir.test, tests/output.test,
tests/output2.test, tests/output3.test, tests/output4.test,
tests/parse.test, tests/phony.test, tests/pluseq.test,
tests/pluseq10.test, tests/pluseq2.test, tests/pluseq3.test,
tests/pluseq4.test, tests/pluseq6.test, tests/pluseq8.test,
tests/postproc.test, tests/ppf77.test, tests/pr2.test,
tests/pr204.test, tests/pr220.test, tests/pr224.test,
tests/pr229.test, tests/pr243.test, tests/pr266.test,
tests/pr279-2.test, tests/pr279.test, tests/pr287.test,
tests/pr300-lib.test, tests/pr300-ltlib.test,
tests/pr300-prog.test, tests/pr307.test, tests/pr72.test,
tests/pr87.test, tests/pr9.test, tests/prefix.test,
tests/proginst.test, tests/python.test, tests/python3.test,
tests/python4.test, tests/python5.test, tests/python6.test,
tests/python7.test, tests/python8.test, tests/python9.test,
tests/recurs2.test, tests/remake.test, tests/remake2.test,
tests/remake3.test, tests/req.test, tests/reqd.test,
tests/rulepat.test, tests/scripts.test, tests/sinclude.test,
tests/space.test, tests/specflg3.test, tests/specflg6.test,
tests/specflg7.test, tests/specflg8.test, tests/specflg9.test,
tests/spell3.test, tests/spelling.test, tests/spy.test,
tests/stamph2.test, tests/stdlib2.test, tests/strip.test,
tests/subcond.test, tests/subcond2.test, tests/subcond3.test,
tests/subdir.test, tests/subdir2.test, tests/subdir3.test,
tests/subdir4.test, tests/subdir5.test, tests/subdir6.test,
tests/subdirbuiltsources.test, tests/subobj.test,
tests/subobj2.test, tests/subobj3.test, tests/subobj4.test,
tests/subobj5.test, tests/subobj6.test, tests/subobj7.test,
tests/subobj8.test, tests/subobj9.test, tests/subobjname.test,
tests/subpkg.test, tests/subst.test, tests/substref.test,
tests/suffix.test, tests/suffix10.test, tests/suffix2.test,
tests/suffix3.test, tests/suffix4.test, tests/suffix5.test,
tests/suffix6.test, tests/suffix7.test, tests/suffix8.test,
tests/suffix9.test, tests/symlink2.test, tests/symlink3.test,
tests/tags.test, tests/tagsub.test, tests/target-cflags.test,
tests/transform.test, tests/txinfo.test, tests/txinfo10.test,
tests/txinfo13.test, tests/txinfo16.test, tests/txinfo17.test,
tests/txinfo18.test, tests/txinfo2.test, tests/txinfo23.test,
tests/txinfo24.test, tests/txinfo25.test, tests/txinfo26.test,
tests/txinfo3.test, tests/txinfo5.test, tests/txinfo6.test,
tests/txinfo7.test, tests/txinfo8.test, tests/txinfo9.test,
tests/unused.test, tests/vars.test, tests/vars3.test,
tests/vartar.test, tests/version.test, tests/version2.test,
tests/version4.test, tests/version6.test, tests/version7.test,
tests/vpath.test, tests/vtexi.test, tests/vtexi2.test,
tests/werror.test, tests/whoami.test, tests/yacc.test,
tests/yacc3.test, tests/yacc4.test, tests/yacc5.test,
tests/yacc6.test, tests/yacc7.test, tests/yacc8.test,
tests/yaccpp.test, tests/yaccvpath.test: Fix license to refer
to Automake, not autoconf.

Fix for PR automake/408:
* lib/am/texinfos.am (install-info-am): Strip any $(srcdir)/ prefix
from $file, as already done for dist-info.
* tests/Makefile.am (TESTS): Add txinfo26.test.
* tests/txinfo26.test: New file.
Report from Nicholas Wourms.

* m4/lispdir.m4 (AM_PATH_LISPDIR): If EMACS=t, empty it before
running AC_CHECK_PROGS(EMACS).
* lib/am/lisp.am (elc-stamp): Quote $(EMACS).
Report from Jens Petersen.

* tests/mkinst2.test: Rewrite.

* m4/mkdirp.m4: Do not require AM_AUX_DIR_EXPAND.

update release instructions

* automake.in (scan_autoconf_traces): Honor sinclude.
* tests/sinclude.test: Check for sinclude.
Report from Roberto Bagnara.

* Makefile.am: Do not rerun `make dist' after tagging, `make distcheck'
already build the tarballs.  Commit files right before tagging.
Check NEWS before running distcheck.

* m4/amversion.in (AM_AUTOMAKE_VERSION): Missing cosmetic space.

* configure.ac, NEWS: Bump version to 1.7c.

* configure.ac, NEWS: Bump version to 1.7b.
* Makefile.am (maintainer-check): Ignore comments while
scanning for rm without -f.

* Makefile.am (fetch): Get all files from savannah.  Do not
postprocess Struct.pm and XFiles.pm, since we now are the master
of these.
* lib/config.sub, lib/config.guess, lib/config-ml.in,
lib/texinfo.tex: New upstream versions.

* configure.ac: Check that autoconf is installed, that it works,
and that it is recent enough in three steps, not one.

* NEWS: Minor edits.

* lib/Makefile.am (dist_script_DATA): Move config-ml.in ...
(dist_pkgvdata_DATA): ... here.

* tests/spy.test: Document overlapping ::-rules incompatibilities,
and check only non-overlapping ::-rules.

* doc/automake.texi (Texinfo): Define MAKEINFO, MAKEINFOHTML,
MAKEINFOFLAGS, AM_MAKEINFOFLAGS, AM_MAKEINFOHTMLFLAGS, TEXI2DVI,
TEXI2PDF, DVIPS, and TEXINFO_TEX in a table.
(Uniform): Do not speak of missing HTML support, this is
confusing.
* lib/Automake/Variable.pm (_silent_variable_override): Add
AM_MAKEINFOHTMLFLAGS.
* lib/am/texibuild.am (%SOURCE_SUFFIX%.html): Use MAKEINFOHTML and
AM_MAKEINFOHTMLFLAGS instead of MAKEINFO and AM_MAKEINFOFLAGS.
* lib/am/texinfos.am (MAKEINFOHTML, AM_MAKEINFOHTMLFLAGS): Define.
* tests/txinfo21.test: Add a test with AM_MAKEINFOHTMLFLAGS.

* tests/spy.test: New file.
* tests/Makefile.am (TESTS): Add spy.test.

remove (not distributed, useless)

* automake.in (handle_configure): Distribute and define mkinstalldirs
only if it is already present in the package.
(scan_autoconf_files): Do not require mkinstalldirs.
(require_build_directory): Use $(mkdir_p), not $(mkinstalldirs).
* lib/am/data.am, lib/am/distdir.am, lib/am/install.am,
lib/am/java.am, lib/am/libs.am, lib/am/lisp.am, lib/am/mans.am,
lib/am/progs.am, lib/am/python.am, lib/am/scripts.am,
lib/am/texinfos.am: Use $(mkdir_p) instead of $(mkinstalldirs).
* m4/mkdirp.m4: New file.
* m4/Makefile.am (dist_m4data_DATA): Add mkdirp.m4.
* m4/init.m4 (AM_INIT_AUTOMAKE): Call AM_PROG_MKDIR_P.
* tests/Makefile.am (TESTS): Remove insh.test.
* tests/insh.test: Delete.
* tests/defs.in, tests/instsh.test: Do not install mkinstalldirs.
* tests/auxdir.test: Install mkinstalldirs.
* tests/distdir.test, tests/instman.test, tests/pr2.test: Use
$(mkdir_p), not $(mkinstalldirs).
* tests/empty.test: Run configure, do not substitute things by hand.
* doc/automake.texi (Optional) <AC_CONFIG_FILES>: Take install-sh
as an example, not mkinstalldirs.
(Auxiliary Programs) <mkinstalldirs>: Update.

* tests/defs.in: Handle required=bzip2.

* tests/defs.in: Export SHELL.
* tests/cond11.test: Missing quotes.
* tests/nogzip2.test: Require bzip2.

* NEWS: Add news entries from 1.6.x and 1.7.x.

* automake.texi (Optional) <AC_SUBST>: Grammar fixes.

* automake.in (check_gnu_standards): Install COPYING only if
none of COPYING, COPYING.LIB, or COPYING.LESSER exist.  Do not
overwrite the license otherwise.
* tests/Makefile.am (TESTS): Add license.test.
* tests/license.test: New file.

* lib/mkinstalldirs: Mention automake-patches@gnu.org and
bug-automake@gnu.org.
* lib/compile, lib/depcomp, lib/elisp-comp, lib/mdate-sh:
Likewise.  Also add support for --help and --version.
* lib/py-compile, lib/ylwrap: Likewise, and reindent.

* lib/am/tags.am (ETAGSFLAGS, CTAGSFLAGS): Remove.
* lib/am/dejagnu.am (RUNTESTFLAGS): Remove.
* lib/am/java.am (JAVACFLAGS): Remove.
* tests/dejagnu3.test: Check that the environment value
of RUNTESTFLAGS get passed down to runtest.
Suggested by Mark Mitchell.

* lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj)
(?GENERIC?%EXT%.lo): Do not echo compile command manually, this
breaks `make -s'.  Instead, fold the compile command on two lines,
so that it take less space on the display.
Suggested by Karl Berry and William Fulton.

* lib/am/texibuild.am (%DEST_PREFIX%%DEST_SUFFIX%): Rename as ...
(%DEST_INFO_PREFIX%%DEST_SUFFIX%): ... this, and honor ?INSRC?
to select $(srcdir) or `.' builds.
(INFO_DEPS): Define here.
* lib/am/texinfos.am (dist-info): Strip filename starting with
"$(srcdir)/".
* automake.in (output_texinfo_build_rules): Take a new argument
$insrc, and adjust substitutions in 'texibuild'.
(handle_texinfo_helper): Compute a regex of all user-cleaned
files, and use this to select whether to build .info files in `.'
or $(srcdir).  Give an account of the $(srcdir) vs `.' debacle.
Alway build the version.texi and stamp files in $(srcdir).  Do not
define INFO_DEPS.
* tests/Makefile.am (TESTS): Add txinfo23.test, txinfo24.test,
and txinfo25.test.
* tests/txinfo23.test, tests/txinfo24.test, tests/txinfo25.test:
New files.
* tests/txinfo13.test, tests/txinfo16.test, tests/txinfo3.test,
tests/vtexi.test: Adjust to new rules.

* m4/init.m4 (AM_INIT_AUTOMAKE): Require Autoconf 2.58.
* configure.ac: Require Autoconf 2.58a, and check for 2.58.

* lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Erase %STAMP%.
* tests/Makefile.am (TESTS): Add autohdr3.test
* tests/autohdr3.test: New file.

* automake.in (handle_configure): Rename am__configure_deps
as am__aclocal_m4_deps and include $(ACLOCAL_M4_SOURCES) and
$configure_ac.  Define am__configure_deps as am__aclocal_m4_deps
+ $(CONFIGURE_DEPENDENCIES) + $(ACLOCAL_M4).  Do not define
ACLOCAL_M4_DEPS while processing configure.am.
(make_paragraphs): Do not define %CONFIGURE_AC%, now unused.
(scan_aclocal_m4): Do not distribute aclocal.m4, this
is done from lib/am/configure.am.
* lib/am/configure.am (%MAKEFILE-IN%, DIST_COMMON,
$(top_srcdir)/configure, $(ACLOCAL_M4)): Simplify using
$(am__configure_deps) or $(am__aclocal_m4_deps).
* lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Likewise.

* lib/am/remake-hdr.am ($(srcdir)/%CONFIG_HIN%): Depend on
$(am__configure_deps).

* automake.in (handle_configure): Distribute all AC_CONFIG_HEADERS
sources, and without using require_file.  Define %CONFIG_H_DEPS%
and %FIRST_CONFIG_HIN% while processing remake-hdr.am.
* lib/am/remake-hdr.am (%STAMP%): Use %CONFIG_H_DEPS% instead
of (srcdir)/%CONFIG_HIN%.  Output the $(srcdir)/%CONFIG_HIN%
rule only for the first header (i.e., if %FIRST_CONFIG_HIN%).
* tests/autohdr4.test: New file.
* tests/Makefile.am (TESTS): Add autohdr4.test.
* tests/config.test: Do not grep, run things to see if they work.

* tests/output7.test: Populate sub/ with a dummy file, so that it
is not empty.  This fixes a failure reported by Patrick Welche.
* lib/am/distdir.am: Add note about tar's `-o' option and empty
directories.

* lib/ylwrap: Typo in regex.

* lib/Automake/XFile.pm: Don't assume -j is solo.
Issue a more-informative diagnostic.
Problems reported by Eric Sunshine.

* m4/lispdir.m4 (AM_PATH_LISPDIR): Always check for Emacs.
Always define lispdir.
* lib/am/lisp.am (install-%DIR%LISP, uninstall-%DIR%LISP): Check
$(EMACS) to decide whether _LISP files must be installed,
not $(lispdir).
* doc/automake.texi (Emacs Lisp): Mention the two ways to install
non byte-compiled Emacs lisp files.
* tests/lisp4.test, tests/lisp5.test: Check "make install"
when EMACS=no.
Suggested by Simon Josefsson.

typo

* NEWS: Clarify the entry about multiple conditional definitions
of _PROGRAMS, _LDADD, and _LIBADD.
Report from Simon Josefsson.

* lib/am/install.am (install-strip): Override install_sh_PROGRAM
too.
Report from Elmar Hoffmann.

* aclocal.in ("MAIN", usage, parse_arguments): Move near
the end, so "MAIN" can use prototypes.
(scan_configure): Move later too, for the sake of prototypes.
(scan_configure_dep): Fix setting of $scanned_configure_dep.
(trace_used_macros): Do not take any argument.

* tests/stdlib2.test: Check AM_LDFLAGS alone.

* lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
versions.

* automake.in (handle_ltlibraries): Also grep AM_LDFLAGS for `-module'.
* tests/stdlib2.test: New file.
* tests/Makefile.am (TESTS): Add stdlib2.test.
Report from Kevin P. Fleming.

* tests/defs.in: For required=runtest, check that we are using
a DejaGnu that supports specifying the program on the command-line.

For Debian Bug #213524:
* lib/am/texinfos.am (install-info-am, uninstall-info-am): Merge
stderr and stdout, and grep only the first line while testing
install-info --version's output.  This revert part of the change
from 2001-05-18.

* m4/amversion.in: Add (C) to the Copyright notice.

* lib/Automake/XFile.pm: Use Errno.
(lock): Ignore ENOLCK errors.  Problem reported Andreas Schwab in
<http://mail.gnu.org/archive/html/bug-autoconf/2003-09/msg00141.html>.

* lib/Automake/Options.pm (_process_option_list): Recognize
no-dist.
* NEWS: Update.
* doc/automake.texi (Options): Document no-dist.
* automake.in (check_cygnus): Set no-dist option.
(handle_dist): Recognize no-dist.
* tests/nodist3.test: New file.
* tests/Makefile.am (TESTS): Added nodist3.test.

* automake.in (handle_clean): Take $makefile as argument, and
define %MAKEFILE% while processing clean.am.
(generate_makefile): Pass $makefile to handle_clean.
* lib/am/clean.am (distclean, maintainer-clean): Erase %MAKEFILE%,
not Makefile.
* tests/gnumake.test: New file.
* tests/Makefile.am (TESTS): Add gnumake.test.
Report from Braden N. McDaniel.

* doc/automake.texi (Scripts): Update the example about automake.
Mention `dist_' for distributed scripts.

* lib/mkinstalldirs: Clean up after NextStep and OpenStep mkdir.
Suggested by Eric Sunshine.

* README: More mailing lists.

* NEWS: Mention the switch to GNU FDL for the manual.

* lib/install-sh (src, dst): Protect names starting with `-',
as in mkinstalldirs.

* configure.in: Rename as ...
* configure.ac: ... this.
* README: s/configure.in/configure.ac/.

* doc/fdl.texi: New file.
* doc/Makefile.am (automake_TEXINFOS): New variable.
* doc/automake.texi (Copying This Manual): New appendix, include
fdl.texi.
(Macro and Variable Index, General Index): Move as subsections of ...
(Indices): This new appendix.

* doc/automake.texi: Refer to configure.ac instead of configure.in.

* automake.texi: Move ...
* doc/automake.texi: ... here.
* doc/Makefile.am: New file.
* configure.in: Output doc/Makefile.
* Makefile.am (SUBDIRS): Add doc.
(ETAGS_ARGS, TAGS_DEPENDENCIES): Move to doc/Makefile.am.

* aclocal.in (write_aclocal): Consider files with relative
paths as local to the project, i.e., subject to m4_include.
* tests/subpkg.test (ACLOCAL_AMFLAGS): Make sure m4_include
is also used for .m4 files in the outer project.

Support for multiple inputs in AC_CONFIG_FILES.
Requested long ago by Harlan Stenn.
* automake.in (handle_dist): Remove unused argument $makefile.
(handle_subdirs): Expect SUBDIRS elements in $relative_dir,
not $am_relative_dir.
(rewrite_inputs_into_dependencies): Allow $add_srcdir to
be a filename that must always be prefixed by $(srcdir) or
$(top_srcdir).
(handle_configure, generate_makefile): Revamp to make the
Makefile.am, Makefile.in, Makefile more independent.
(locate_am): New function.
(scan_configure_dep, parse_arguments): Use locate_am.
(MAIN): Adjust call to generate_makefile.
* lib/am/configure.am: Remove %MAKEFILE-IN% from the dependencies
of %MAKEFILE%.  %MAKEFILE-IN% is already in %MAKEFILE-DEPS%.
* tests/output6.test, tests/output7.test: New files.
* tests/Makefile.am (TESTS): Add them.
* automake.texi (Requirements) <AC_CONFIG_FILES>: Document how
multiple inputs are scanned.

missing file from 2003-08-29

* Makefile.am (FETCHFILES, fetch): Do not fetch lib/Automake/XFile.pm
and lib/Automake/Struct.pm from Autoconf.
* lib/Automake/XFile.pm: Update comment, Automake is now
the master for this file.  Cosmetic changes.

* lib/Automake/FileUtils.pm (&update_file): s/cannot not/cannot/g.
Reported by Gary Vaughan.
(&find_file): Walk the @include in forward order.

* lib/Automake/FileUtils.pm (&update_file): Be sure not to leave
trailing files.

Changes to m4_included files should also cause aclocal.m4 to change.
* aclocal.in (m4_include_rx): New variable.
(scan_configure_dep): New function.
(scan_configure, add_file): Simplify using scan_configure_dep.
* tests/Makefile.am (TESTS): Add acloca13.test.
* tests/aclocal13.test: New file.

* tests/instsh.test: Do not reset $ACLOCAL and $AUTOMAKE now
that we have fake version in the $PATH.

* aclocal.in (add_file): Remove useless filling of $output, probably
left a after CVS conflict.  This code is now in write_aclocal.

* aclocal.in (configure_ac): Do not call require_configure_ac
before parsing the options.
* automake.in (configure_ac): Likewise.
* lib/Automake/Variable.pm (configure_ac): Do not require configure.ac,
find it.
* lib/Automake/Configure_ac.pm (require_configure_ac):
find_configure_ac never return an undefined value, so test
the file's existence instead.
* tests/Makefile.am (TESTS): Add help.test.
* tests/help.test: New file.

* lib/Automake/XFile.pm: Update to use ChannelDefs.
(close): Call Automake::FileUtils::handle_exec_errors on errors.
* automake.in (scan_autoconf_files): Exit with $?=63 on version
mismatch.
(scan_autoconf_traces): Likewise.  Close the autoconf pipe to
capture abnormal exits.
* aclocal.in ($exit_status): Remove, and use Channels.pm's $exit_code
instead.
(trace_used_macros): Close the autom4te pipe to capture abnormal exits.
* lib/missing: When a tool has run and exited with $?=63, emulate
it.  Adjust the diagnostic and pretend the tool is tool old in this
case.  Use an emacs-updated "scriptversion" variable.
* configure.in: Output tests/aclocal-${APIVERSION} and
tests/automake-${APIVERSION}.
* tests/aclocal.in, tests/automake.in,
tests/missing.test, tests/missing2.test: New files.
* tests/defs.in (AUTOMAKE, ACLOCAL, PATH): Define
to use tests/aclocal-$APIVERSION and tests/automake-$APIVERSION.
* tests/dup3.test: Remove. alocal9.test, acloca10.test, and others are
already testing for this.
* tests/depacl2.test, tests/dup2.test, tests/order.test: Fix
configure.in so that aclocal works.
* tests/defun.test: Quote the AC_DEFUN body.
* tests/Makefile.am (TESTS): Add missing.test and missing2.test,
and remove dup3.test.
(check_SCRIPTS): Add aclocal and automake.

* tests/unused.test: Quote AC_DEFUN arguments.

Spelling and minor grammar fixes.

* lib/config.sub, lib/config.guess, lib/texinfo.tex,
lib/config-ml.in, lib/symlink-tree: New upstream versions.

* tests/yacc7.test: Require bison.

* aclocal.in (scan_file): Warn about underquoted AC_DEFUN.
($underquoted_manual_once): New variable.
* automake.texi (Extending aclocal): Document this.

* aclocal.in (@file_order): New variable, to make sure
files are output in the opposite order of the -I arguments.
(scan_file): Fill it.
(trace_used_macros, write_aclocal): Use it.
(scan_m4_files): Reverse the directory contents, so that
macros from the lexicographically greatest files are preferred.
* tests/aclocal9.test, tests/acloca10.test, tests/acloca11.test:
New files.
* tests/Makefile.am (TESTS): Add them.

For Debian Bug #206299:
* automake.in ($configure_deps_greatest_timestamp,
$output_deps_greatest_timestamp): New variables.
(initialize_per_input): Reset $output_deps_greatest_timestamp.
(scan_autoconf_traces, scan_autoconf_files, read_am_file):
Update $configure_deps_greatest_timestamp and
$output_deps_greatest_timestamp
(generate_makefile): Rewrite the logic to decide whether
to rewrite the output.  Move the leading dup_channel_setup
and trailing drop_channel_setup to MAIN, so that
drop_channel_setup is executed for all exit paths.
* tests/aclocal7.test: Update to check for $AUTOMAKE --no-force
* tests/distcom6.test: New file.  Report from Scott James Remnant.
* tests/Makefile.am (TESTS): Add distcom6.test.

* configure.in: Require Autoconf 2.57b to be sure
aclocal can use autom4te --language Autoconf-without-aclocal-m4.
* m4/init.m4: Likewise.  Move the AC_PREREQ and m4_pattern_allow
calls inside the AM_INIT_AUTOMAKE macro.
* m4/auxdir.m4, m4/cond.m4, m4/lex.m4, m4/regex.m4: Move
AC_PREREQ calls inside the macros.
* m4/header.m4: Remove AC_PREREQ.

* automake.in (file_contents_internal): Do not add newlines before
empty actions.

* aclocal.in (write_aclocal): Take an output file and list of
used macros in arguments and make up the file contents here.
(trace_used_macros): New function.
(add_file): Do not update $output.
($output): Delete.
(MAIN): Call trace_used_macros.  Then rewrite aclocal.m4 only
for these traced macros.  This should shorten aclocal.m4 by
stripping out unused macros.
* automake.texi (Invoking aclocal): Document ${AUTOM4TE}.
* tests/aclibobj.test: Make sure configure.in exists by the time
aclocal runs.
* tests/aclocal8.test: New file.
* tests/Makefile.am (TESTS): Add aclocal8.test.
Suggested by Bruno Haible and Akim Demaille.

* lib/Automake/Configure_ac.pm (&find_configure_ac)
(&require_configure_ac): Accept an optional directory argument.
($configure_ac): Remove.
* aclocal.in, automake.in ($configure_ac): New.
* lib/Automake/Variable.pm: Don't use $configure_ac, just
configure.ac.

* lib/Automake/FileUtils.pm: More perldoc.
(&up_to_date_p): New.

Fix for PR automake/398:
* m4/python.m4: Do not call AC_PATH_PROGS if $PYTHON is already
set.  Display `none' instead of `:' and $PYTHON is set to `:'
when no suitable interpreter is found.  Honor ACTION-IF-FOUND and
ACTION-IF-NOT-FOUND.
* automake.texi (Python): Document ACTION-IF-FOUND and
ACTION-IF-NOT-FOUND.
* tests/python4.test, tests/python5.test, tests/python6.test,
tests/python7.test, tests/python8.test, tests/python9.test: New
files.
* tests/Makefile.am (TESTS): Add them.
Report from Per Cederqvist.

Fix for PR automake/399:
* m4/python.m4: Use AC_PATH_PROGS, not AC_PATH_PROG.
Report from Per Cederqvist.

* lib/Automake/Condition.pm (strip): Replace loop with 'grep'.
(not): Replace loop with 'map'.
* lib/Automake/DisjConditions.pm (sub_conditions): Likewise.
* lib/Automake/Item.pm (not_alwasy_defined_in_cond):
Don't 'simplify' result of 'invert', since it's already in
canonical form.
* lib/Automake/Rule.pm (define): Replace loop with
'not_always_defined_in_cond'.

typos in comments

* lib/Automake/Item.pm, lib/Automake/ItemDef.pm: New files.
* lib/Automake/Rule.pm, lib/Automake/RuleDef.pm: New files.
* lib/Automake/Makefile.am (dist_perllib_DATA): Add them.
* lib/Automake/VarDef.pm: Make this a subclass of Automake::ItemDef.
(new): Adjust to call Automake::ItemDef::new.
(comment, location, owner): Delete.  Now inherited from ItemDef.
* lib/Automake/Variable.pm: Make this a subclass of Automake::Item.
(_new): Adjust to call Automake::Item::new.
(name, def, rdef, _set, conditions, not_always_defined_in_cond):
Delete.  How inherited from Item, where `_set' is called `set'.
* automake.in (SUFFIX_RULE_PATTERN): Delete. Now in Automake::Rule.
(suffix_rules_default): Delete.  Now
Automake::Rule::_suffix_rules_default
(suffixes): Delete.  Now Automake::Rule::suffixes.
(TARGET_AUTOMAKE, TARGET_USER): Delete.  Now
Automake::RuleDef::RULE_AUTOMAKE and Automake::RuleDef::RULE_USER.
(%targets, %target_source, %target_name, %target_owner): Delete,
replaced by the Rule and RuleDef classes.
(dependencies, depend, actions): Delete.  Now in Automake::Rule.
(suffix_rules, register_suffix_rule): Likewise.
(KNOWN_EXTENSIONS_PATTERN, accept_extensions): Likewise.
(known_extensions_list): Delete.  Now
Automake::Rule::_known_extensions_list.
(target_conditions): Delete.  Now inherited by Automake::Rule
from Automake::Item::conditions.
(rule_define): Delete.  Now Automake::Rule::define.  Adjust all
callers.
(target_defined): Delete.  Now Automake::Rule::rule.  Adjust all
callers.
(initialize_per_input): Adjust to call Automake::Rule::reset.
(err_target, err_cond_target, msg_cond_target, msg_target,
reject_target): Delete.  Now defined in Automake::Rule as
err_rule, err_cond_rule, msg_cond_rule, msg_rule and reject_target.
Adjust all callers.
(handle_languages): Call suffix_rules_count.
* tests/location.test: Adjust expected diagnostics.  We now display
$(EXEEXT) accurately.

Revert the fix for PR automake/291:
* lib/Automake/Variable.pm (define): Do not warn about variables
starting with `_' which are an issue on NEWS-OS 4.2R.  According
to Paul Eggert, NEWS-OS 4.2R is ten years old, the latest version
was released on 1996 and is not in wide use.  On the other hand,
variables starting with `_' are mandatory in several situations,
so diagnosing them is more annoying than useful.
* tests/canon5.test: Do not use -Wno-portability.
* tests/vars2.test: Delete.
* tests/Makefile.am (TESTS): Remove vars2.test.
Suggested by Jim Meyering.

* lib/Automake/DisjConditions.pm (ambiguous_p): Simplify slightly.
* lib/Automake/tests/DisjConditions.pl (test_ambig): Test
Automake::Disjunctions::ambiguous_p.

ignore Config.pm

* lib/Automake/Variable.pm (condition_ambiguous_p): Move ...
* lib/Automake/DisjConditions.pm (ambiguous_p): ... here.
* automake.in (rule_define): Adjust usage.
* lib/Automake/Variable.pm (_check_ambiguous_condition): Likewise.

* lib/Automake/Options.pm: New file.
* lib/Automake/Makefile.am (dist_perllib_DATA): Add Options.pm.
* automake.in (FOREIGN, GNU, GNITS, $default_strictness)
($default_strictness_name, $strictness, $strictness_name)
(%options, %global_options, process_option_list)
(set_strictness): Remove, now in Options.pm.
(initialize_per_input): Call Automake::Options::reset.
(handle_options, get_object_extension, get_object_extension)
(handle_languages, handle_single_transform_list, handle_compile)
(handle_texinfo_helper, handle_man_pages, handle_dist)
(handle_configure, do_check_merge_target)
(handle_factored_dependencies, handle_tests)
(handle_minor_options, scan_autoconf_traces, check_cygnus)
(lang_sub_obj, lang_c_rewrite, lang_c_finish, rule_define)
(make_paragraphs, am_install_var, parse_arguments): Adjust
to set and read options via the new interface.

* Makefile.am (maintainer-check): Update perllibdir.
* lib/Automake/Makefile.am (Config.pm): Depend on Makefile too.
(EXTRA_DIST): Add Config.in.
* Makefile.in, lib/Automake/Makefile.in: Regenerate.
* tests/defs.in (AUTOMAKE, ACLOCAL): Use absolute paths in
$perllibdir.