For PR automake/266:
* tests/Makefile.am (TESTS): Added pr266.test.
* tests/pr266.test: New file.
* m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Handle
non-standard name for makefile.

For PR automake/279:
* automake.in (conditional_ambiguous_p): New sub.
(handle_lib_objects_cond): Use it.
(check_ambiguous_conditional): Use it.
* tests/Makefile.am (TESTS): Added pr279.test, pr279-2.test.
* tests/pr279.test: New file.
* tests/pr279-2.test: New file.

For PR automake/249:
* tests/Makefile.am (TESTS): Added nodist2.test.
* tests/nodist2.test: New file

* m4/multi.m4: Fix quoting in AC_OUTPUT_COMMANDS.

* configure.in: Test for Autoconf >= 2.52.
* tests/defs (needs_autoconf, has_autoconf): Delete definition.
* tests/ansi3.test, tests/ansi5.test, tests/ccnoco.test,
tests/cond4.test, tests/cond9.test, tests/cond16.test,
tests/cond18.test, tests/cond19.test, tests/cond20.test,
tests/confsub.test, tests/depcomp2.test, tests/depdist.test,
tests/depend2.test, tests/dirname.test, tests/distname.test,
tests/extra5.test, tests/install2.test, tests/lex3.test,
tests/make.test, tests/nobase.test, tests/pr9.test,
tests/pr87.test, tests/stamph2.test, tests/subdir5.test,
tests/subdirbuiltsources.test, tests/subobj3.test,
tests/subobj5.test, tests/subobj6.test, tests/substref.test,
tests/target-cflags.test, tests/yacc4.test, tests/yacc7.test,
tests/yaccvpath.test: Do not use $needs_autoconf.

* configure.in: Bump version to 1.5c.

* configure.in: Bump version to 1.5b.

* lib/config.sub, lib/config.guess: New versions from FSF.

* lib/am/lex.am, lib/am/yacc.am: Use `rm -f', not `rm'.

* automake.in (check_gnu_standards, check_gnits_standards): Pass
"$am_file.am" as WHERE argument to require_file.

* m4/python.m4 (AM_PATH_PYTHON): Check all known Python interpreters
in loop until we find one the satisfies the user supplied version.
Add python2 to the list of known interpreters.  Don't use
changequote.  Cache the calculation of PYTHON_VERSION and
PYTHON_PLATFORM.
(AM_PYTHON_CHECK_VERSION): New function, extracted from
AM_PATH_PYTHON and modernized.
* m4/runlog.m4: New file.
* m4/Makefile.am (m4data_DATA): Add it.

* tests/confsub.test, tests/depdist.test, tests/extra5.test,
tests/nobase.test, tests/stamph2.test,
tests/subdirbuiltsources.test: Require Autoconf.

* automake.texi (Dist): Document $(DISTCHECK_CONFIGURE_FLAGS).
* lib/am/distdir.am (distcheck): Honnor $(DISTCHECK_CONFIGURE_FLAGS).
Suggested by Merijn de Jonge.

* lib/am/tags.am (ID): Search $(LISP) files in $(srcdir),
like other ID dependencies.
Suggested by Christian Cornelssen.

* automake.in (handle_dist): Distribute common files which
do not exist but are target of a Makefile rule.
* automake.texi (Dist): Update.
* test/builtcommon3.test: New file.
* test/Makefile.am (TESTS): Add distcommon3.test.

* automake.in (macro_define): Fix misuse of chomp introduced on
2001-11-28.

* automake.in (append_comments): New.  Extracted from
read_am_file.  Match 'n' with a regexp, don't use substr (the
perlport man page says 'n' is not always one byte wide).
(read_am_file):  Use it.  Always chomp $_.
(file_contents_internal):  Use append_comments.
(macro_define): Don't treat the trailing 'n' with substr, use
a regexp or chomp.

* tests/defs: Turn on shell traces when VERBOSE=x.

* automake.texi (Assembly Support): Mention .s and .S as only
suffixes.

* tests/subdirbuiltsources.test: Set -e after sourcing defs, not
before.

* tests/lex3.test: Require GNU Make.

* tests/defs (ACLOCAL): Add -I $srcdir/../m4 before any other
directory.

* lib/am/tags.am (TAGS): Search %CONFIG% and $(LISP) files
in $(srcdir), like other TAGS dependencies.
Suggested by Christian Cornelssen.

* automake.in (&macro_define): Use $where when reporting an error,
not the place where the macro was first defined since (i) if this
is the first definition, then obviously it was not defined before,
and (ii) anyway, the error is with the new definition, not the
first.

* lib/am/distdir.am (distcheck): Call distcleancheck.
(distcleancheck_listfiles, distcleancheck): New, extracted from
distcheck.
* automake.texi (Checking the distribution): Document
distcleancheck_listfiles and distcleancheck.

* automake.in (scan_one_autoconf_file): Parenthesize qw// in
foreach invocation, otherwise Perl5.005_03 complains about a
syntax error.  Reported by Yann Droneaud.

* automake.in (scan_texinfo_file): Suppress FIXME about strange
map behavior.

* tests/defs (aclocaldir): Check for existence of libtool.m4 and
gettext.m4 if required.

Recommend the usage of $(am__cd).

* automake.in (define_objects_from_sources,
handle_lib_objects_cond, value_to_list): Use quotemeta instead of
the equivalant substitution.

* automake.in (SUFFIX_RULE_PATTERN): Add '_(){}$@' to the
set of accepted characters in extensions.
(rule_define): Convert '.o' and '.obj' into '$(OBJEXT)' for
internall use.
* tests/suffix6.test: Ensure that `.o' is handled like `.$(OBJEXT)'.

* automake.texi (Suffixes): Don't require SUFFIXES, but document
its use for the "extreme" cases.

* automake.in (rule_define): Use $KNOWN_EXTENSIONS_PATTERN
to match suffix rules for known extensions, or call
accept_extensions on suffixe rules for unknown extensions.
(var_SUFFIXES_trigger): New function.
(macro_define): Call var_VAR_trigger when $VAR is updated.
* tests/suffix6.test, tests/suffix7.test: New files.
* tests/Makefile.am (TESTS): Add suffix6.test and suffix7.test.

* automake.in (KNOWN_EXTENSIONS_PATTERN, known_extensions_list):
New variables.
(handle_single_transform_list, lang_yacc_target_hook): Use
KNOWN_EXTENSIONS_PATTERN.
(accept_extension): New function.
(register_language): Call it.

At every place where an "$extension" is used, include the leading
dot in the extension, don't hardcode it when building the filename.
That will make any support for a dot-less extension easier to add.

* automake.in (SUFFIX_RULE_PATTERN): Include extension dots in
backref groups.
("main"): Prepend a '.' to the supported extensions of all
languages (e.g. 'c' becomes '.c').
(handle_languages, handle_single_transform_list,
handle_lib_objects_cond, handle_headers, derive_suffix,
rule_define): Do not add a dot
before extensions, and include dots in matching groups.
* lib/am/depend2.am (.%EXT%.o, .%EXT%.obj, .%EXT%.lo): Rename as ...
(%EXT%.o, %EXT%.obj, %EXT%.lo): ... these.
* lib/am/lex.am (.%EXT%.%DERIVED-EXT%): Rename as ...
(%EXT%%DERIVED-EXT%): ... this.
* lib/am/yacc.am: Likewise.

* m4/make.m4 (AM_MAKE_INCLUDE): Serial 2.
Use `"#"' and `"""', which
Autoconf mode prefers over `'#'' and `'"''.
* m4/missing.m4 (AM_MISSING_HAS_RUN): Serial 3.
Rely on AC_MSG 2.50's quotation.

* automake.in (scan_texinfo_file): Typo from 2001-11-05.

* lib/am/distdir.am (distdir): Also look for directory in build
directory first. (See 2001-05-14.)
* tests/Makefile.am (TESTS): Add extra5.test.
* tests/extra5.test: New file.
From Dean Povey.

Fix for distcommon2.test:
* automake.in (automake_needs_to_reprocess_all_files): New
variable.
("main"): Process all Makefiles a second time if
$automake_needs_to_reprocess_all_files is set.
(maybe_push_required_file): Return 1 or 0 whether the file is
pushed or not.
(require_file_internal): Set $automake_needs_to_reprocess_all_files
if an added file can't be pushed.

* test/distcommon2.test: New file.
* test/Makefile.am (TESTS): Add distcommon2.test.
From Pavel Roskin.

* automake.in (exec_dir_p): Remove.  Replace by...
(EXEC_DIR_PATTERN):... this.
(am_install_var): Adjust to use EXEC_DIR_PATTERN.

Fix for nobase.test:
* lib/am/header-vars.am (install_sh_DATA): New.
* lib/am/data.am (install-%DIR%%PRIMARY%): Declare and use
%DIR%%PRIMARY%_INSTALL, and set it to $(install_sh_DATA) instead
of $(INSTALL_DATA) for nobase_ targets.
* lib/am/lisp.am (install-%DIR%LISP): Likewise.
* lib/am/python.am (install-%DIR%PYTHON): Likewise.
* tests/nobase.test (configure.in): Append AC_OUTPUT.
* tests/Makefile.am (XFAIL_TESTS): Remove nobase.test.

Englisho.

* automake.texi: Remove references to stamp-h.in, which no longer
exist.
* tests/stamph2.test: Formatting change.

* tests/suffix3.test: Check for foo.$(OBJEXT) in Makefile.in.
Don't use -Wno-error.

* tests/suffix4.test ($AUTOMAKE): Don't use -Wno-error.
* tests/suffix5.test ($AUTOMAKE): Likewise.

* m4/init.m4 (AM_INIT_AUTOMAKE): Don't escape quotes in
AC_MSG_ERROR.
Reported by Jim Meyering.

* lib/am/distdir.am (am__remove_distdir): Define in topdir only.

* lib/am/distdir.am (am__remove_distdir):
New macro.  Do not change permission of non-directories.
Change only user permission, as there's no point to changing group
or other permission.
(distdir, dist, dist-bzip2, dist-tarZ, dist-shar, dist-zip, dist-all,
 distcheck): Use it.

(am__remove_distdir):
New macro.  Do not change permission of non-directories.
Change only user permission, as there's no point to changing group
or other permission.
(distdir, dist, dist-bzip2, dist-tarZ, dist-shar, dist-zip, dist-all,
 distcheck): Use it.

* lib/am/python.am: Cleanup the cleaning section.
* automake.texi (Python): Remove documentation for PYCFILES
and PYOFILES.  Update the first paragraphes.

* automake.in (FOREIGN, GNU, GNITS, AC_CANONICAL_HOST,
AC_CANONICAL_SYSTEM, MOSTLY_CLEAN, DIST_CLEAN): Define as constants.
Adjust usage everywhere.

* automake.in (libtool_files, libtool_sometimes, common_files,
common_sometimes, config_aux_path): Use qw to simplify definition.
(scan_texinfo_file) <clean_suffixes, predefined_index,
hidden_index>: Likewise.
(scan_autoconf_traces) <traced>: Likewise.
(scan_one_autoconf_file, check_gnu_standards, resolve_linker):
Likewise.

* automake.in (handle_single_transform_list): Pass $nonansi_obj to
derive_suffix.  Don't use an hardcoded 'o' for object extensions.
(derive_suffix): Accept $OBJ as a second argument, don't
hardcode 'o'.
* tests/suffix5.test: New test.
* tests/Makefile.am (TESTS): Add suffix5.test.
Reported by Arkadiusz Miskiewicz <misiek@pld.ORG.PL>.

* automake.in (handle_single_transform_list): Don't call
$lang->target_hook for undefinied langages.
* tests/suffix4.test: New test.
* tests/Makefile.am (TESTS): Add suffix4.test.
Reported by Dmitry Mikhin <dmitrym@acres.com.au>.

Typo.

* automake.in (@common_sometimes, &handle_configure): No longer
use stamp-hin.
* lib/am/remake-hdr.am: Adjust.
* tests/confh.test: There is no stamp.hin.

* lib/am/lex.am, lib/am/yacc.am: Use the output file name in
`#line' and multiple inclusion guards.
* lib/ylwrap: Remove debugging code.
(input_dir, input_rx): Move where used.
Use the output file name in `#line'.

typo in Olivier Louchart-Fletcher email

* automake.in (transform): Update documentation.

* m4/gcj.m4 (AM_PROG_GCJ): Define GCJFLAGS if unset.
Reported by Olivier Louchart-Fletcher <olivier@zipworld.com>.

* automake.in (&create): Reinstall.

* automake.in (append_exeext): Use macro_delete.

* automake.in ($verbose): Remove, inherited from
Automake::General.
(&variable_delete): Rename as...
(&macro_delete): this, for consistency.
(&variable_assert): New.
(&variable_value_as_list, &variable_value_as_list_recursive_worker):
Use it.

* m4/lispdir.m4 (AM_PATH_LISPDIR): Use AC_RUN_LOG to avoid
cluttering configure's stdout.

* automake.in: Various formatting changes.
(create): Remove, unused.

* automake.in (&append_exeext): New.
(&am_primary_prefixes): Use it.

* automake.in (am_primary_prefixes): Now, in accordance with its
comment, return the list of prefixes actually used, not all the
possible prefixes for a primary.
(&handle_libraries, &handle_ltlibraries, &handle_java)
(&am_install_var): Adjust.
* Makefile.am (maintainer-check): Allow `local $_;'.

* automake.in: Various formatting changes.
(&variable_defined): Second argument is optional.

* automake.in (&am_primary_prefixes): Now returns a list, not a
hash.
(&handle_libraries, &handle_ltlibraries, &handle_java)
(&am_install_var): Adjust.

* automake.in (@libtoolize_files, @libtoolize_sometimes): Rename
as...
(@libtool_files, @libtool_sometimes): these.
($libtool_location): Remove, completely replaced by $seen_libtool.
(&require_file_internal): Do not run libtoolize, that's
autoreconf's job.

* tests/acoutnoq.test, tests/acoutput.test, tests/acoutqnl.test,
* tests/acouttbs.test, tests/auxdir.test, tests/colon.test,
* tests/colon2.test, tests/colon3.test, tests/colon4.test,
* tests/colon5.test, tests/colon6.test, tests/colon7.test,
* tests/conf2.test, tests/config.test, tests/depcomp.test,
* tests/depcomp2.test, tests/discover.test, tests/fpinst2.test,
* tests/fpinstall.test, tests/ldadd.test, tests/libobj7.test,
* tests/libobj8.test, tests/output.test, tests/output2.test,
* tests/output3.test, tests/output4.test, tests/output5.test,
* tests/pr2.test, tests/remake.test, tests/remake2.test,
* tests/remake3.test, tests/scripts.test, tests/stamph.test,
* tests/subdir.test, tests/subdir2.test, tests/subdir4.test,
* tests/tagsub.test, tests/texinfo8.test: Remove PACKAGE and VERSION
assignments.

* automake.in (&scan_autoconf_traces): Use eq for equality.
Anchor regexps.
Remove dead comment.
(&initialize_per_input): Don't initialize several times the same
vars.

* automake.in (scan_one_autoconf_file): When using %generalize, be
sure to replace only words.  AC_FUNC_OBSTACK was matching
M4_AC_FUNC_OBSTACK.

Formatting changes.

* tests/stamph2.test: Strengthen.
* tests/confh2.test, tests/confh3.test: Remove.
These are bad tests: they don't check the effects, but some
internal details in Makefile.
And they are covered by stamph2.test.

Now that stamp-h's are created by config.status, we don't need to
handle them in Makefile's.
* lib/am/remake-hdr.am (%STAMP%): Just run config.status.
* m4/header.m4 (_AM_STAMP): New.
(_AM_CONFIG_HEADER): Use it.

* automake.in (&generate_makefile, &handle_texinfo_helper)
(&handle_man_pages, &handle_dist, &handle_configure, &handle_all)
(&define_pretty_variable, &read_am_file, &file_contents_internal)
(&am_install_var, &push_dist_common, &unquote_m4_arg): Simplify
`join (' ', @list)' into `"@list"'.

* automake.in (@config_fullnames, @config_names): Remove.
(@config_headers): Now contains the actual spec used in
AC_CONFIG_HEADERS.
(&split_config_file_spec): New.
(&handle_tags, &handle_configure, &handle_all, &scan_autoconf_traces)
(&scan_one_autoconf_file): Adjust.
(&scan_one_autoconf_file): Pff, don't think _AM_CONFIG_HEADER is
AM_CONFIG_HEADER.

* m4/header.m4 (_AM_CONFIG_HEADER): New.
(AM_CONFIG_HEADER): Use it.

* automake.in (&handle_configure): Use the config.status 2.50
invocation syntax for config files and headers.
autoheader needs the name of the file to create, not from what it
must be created, hence CONFIG_HEADER_FULL is $one_name, not
$one_fullname.
* lib/am/configure.am, lib/am/remake-hdr.am: Likewise.
* tests/confsub.test (SUBDIRS): Adjust to the new config.status
invocation.
Strengthen: Use the non-default config.hin source.
Strengthen: Make sure config.h is properly updated when config.hin
is changed.

* automake.in (&handle_configure): Seeing Automake files in
@other_input_files is a programming error, not merely something to
ignore.
Factor slightly the code.

* automake.in ($canonical_location): New.
Use it.
(&require_config_file, $line_error): Remove.

* automake.in: Use &verbose.
(&generate_makefile, &scan_texinfo_file, &scan_aclocal_m4): Use
Automake::XFile.

* lib/am/python.am (install-%DIR%PYTHON, uninstall-%DIR%PYTHON):
Have the basename step optional and use %NDIR% instead of %DIR% in
filenames in order to support 'nobase_'.

* automake.in (handle_languages, handle_single_transform_list,
lang_c_rewrite): Use require_conf_file instead of
require_config_file to require depcomp or compile from
Makefile.am.  (This is a part of my patch of 2001-10-15 which got
mistakenly reverted.)

* tests/confh.test: Since 2001-10-20 Kevin Ryde, stamp-h is
stamp-h1.

Since the ansi2knr patch from 2001-10-20 Kevin Ryde, `$U' can
appear in Makefile.in in the clean rule.
* tests/cxxansi.test: Adjust.

* automake.in (&am_print_error, &am_file_error, &am_macro_error)
(&am_target_error, &am_line_error, &am_conf_error, &am_file_warning):
Rename as...
(&print_error, &file_error, &macro_error, &target_error, &line_error)
(&conf_error, &file_warning): these.
(&file_warning): Fix the prototype and argument handling.
(&am_line_warning): Remove, unused.
Also, repair the misapplication of previous patches.

Typo.

* automake.in ($ac_output_location): Replace with...
($ac_config_files_location): this.
(&scan_autoconf_traces): We don't need $file and $line, $here is
enough.
(&scan_one_autoconf_file): Use `$in_ac_output' to store the macro
name (AC_OUTPUT or AC_CONFIG_FILES) for error messages.

* automake.in (&require_file_with_macro): Use &require_file.
(&read_am_file): Move the definition of $here at its proper place.

* automake.in ($libtool_line, $seen_pythondir): Replace with...
($libtool_location, $pythondir_location): these.
(&require_conf_file_with_line, &require_conf_file_with_line):
Remove, unused.
(&require_file): Don't forget $where.
(&require_conf_file): Ahem...  Fix the name.
(&require_config_file): Invoke &require_conf_file, not yourself.
(&am_line_error): Fix the default am_file_error invocation.

* automake.in ($seen_lispdir): Replace with...
($am_lispdir_location): this.
(&require_conf_file): New.
(&require_config_file, &require_conf_file_with_line,
(&require_conf_file_with_conf_line): Use it.
(&require_conf_file_with_macro): New.

* automake.in ($config_header_line, $ac_output_line)
($ac_gettext_line, $package_version_line): Replace with...
($config_header_location, $ac_output_location)
($ac_gettext_location, $package_version_location): these.
(&require_file_with_conf_line, &require_file_with_line): Remove,
no longer used.

* automake.in (&require_file_internal): Instead of $file and $line,
take $where as first argument.
Adjust all callers.
(&require_file_with_macro): New.
Use it where internal black magic was used to recover the location
of a macro definition.

* automake.in (&read_am_file): Define and use `$here'.
Avoid using am_line_error.

* automake.in (&am_target_error): New.
Use it where appropriate instead of...
(&am_line_error): this.
Using it for a target is a croak error.

* automake.in (&am_macro_error): New.
Use it where appropriate instead of...
(&am_line_error): this.
Using it for a macro is a croak error.

* tests/asm.test: s/AC_PROG_AS/AM_PROG_AS/.
AC_OUTPUT a Makefile.

* automake.in (%var_line): Rename as...
(%var_location): this.
Use it consistently as the location where the macro is defined,
file and line when possible, otherwise just file.
(&read_am_file): Rules have their own location tracking, don't
pollute %var_location.

* automake.in (am_line_error): Clarify.

* automake.in (&am_print_error): Set $exit_status since all your
users do.
(&am_error, &am_file_error, &am_line_error, &am_conf_error):
Don't.
(&am_conf_line_error, &am_conf_line_warning): Remove.
Adjust callers to use &am_file_error and...
(&am_file_warning): new.