Let `missing' also work with versioned and prefixed programs.

* lib/missing: Ignore prefixes of `gnu-', `gnu', and `g' when
testing for known programs; also, ignore suffixes.
* tests/missing.test: Amend test.
* NEWS, THANKS: Update.
Report by Tim Rice.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix tenses, plurals, swap words, cleanup in manual.

* doc/automake.texi (Macro search path, Extending aclocal)
(Local Macros, Serials, Public macros, Directories)
(Conditional Subdirectories, Nesting Packages)
(Building a program, Libtool Modules)
(Program and Library Variables, Default _SOURCES, LIBOBJS):
Correct verb/object tense agreement, swap some words,
and general trivial cleanup.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix more typos and grammaros in the manual.

* doc/automake.texi (VPATH Builds, Nested Packages)
(Length limitations, Auxiliary Programs, Invoking Automake)
(Requirements, Optional): Fix typos and grammaros, correct URL
to 'config' source repository.  Rewrite description of AC_SUBST.
(true): Cross-reference to `Default _SOURCES' node.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Quote APIVERSION in configure.ac.

* configure.ac: Quote APIVERSION.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix typo introduced by Committer in last patch.

* tests/xz.test: Fix typo introduced by Ralf in last patch.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Add xz compression support.

* NEWS: Mention xz, as well as lzma (xz will displace lzma).
* automake.in (handle_dist): Recognize dist-xz.
(make_paragraphs): Map XZ to dist-xz.
* doc/automake.texi (Dist): Add dist-xz.
(Options): Likewise.
* lib/Automake/Options.pm (_process_option_list): Accept
dist-xz.
* lib/am/distdir.am (dist-xz): New rule.
(dist dist-all): Add command to create an xz-compressed tarball.
(distcheck): Handle xz-compressed tarballs just like the others.
* tests/xz.test: New file, based on nogzip.test.
* tests/Makefile.am (TESTS): Add xz.test.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

When installing COPYING, recommend adding the file to VCS.

* automake.in (require_file_internal): If installing `COPYING',
mention that we install the GPLv3 file and recommend adding the
file to version control.
* doc/automake.texi (Invoking Automake): Point to `Gnits' node
for `--add-missing'.
(Gnits): Clarify semantics: that for strictness gnu or higher,
INSTALL is installed, and that COPYING is installed as GPLv3
if no COPYING file exists.
* tests/license2.test: New test.
* tests/Makefile.am: Update.
* NEWS, THANKS: Update.
Report by Brian Cameron.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix typos and grammaros in the documentation.

* doc/automake.texi (Timeline): Fix typos and grammaros.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

New gnupload option --delete to remove archive files.

* lib/gnupload: Accept --delete to remove files from
alpha.gnu.org or ftp.gnu.org.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Testsuite fixes for ksh.

* tests/check10.test: Add ':' as last command in subshell, for
zero exit status of the subshell.
* tests/parallel-am.test: Do not let failing 'unset' of
nonexistent variable exit the test.
* tests/parallel-am2.test: Likewise.
* tests/parallel-am3.test: Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Cleanup config.lt in case LT_OUTPUT is in use.

* lib/am/libtool.am [TOPDIR_P] (distclean-libtool): clean up
config.lt as well as libtool.
* tests/libtoo11.test: New test.
* tests/Makefile.am: Update.
* NEWS: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Sync auxiliary files from upstream.

* INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
lib/texinfo.tex: Sync from upstream.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Update to GFDL 1.3.

* doc/fdl.texi: Update to GFDL 1.3.
* doc/automake.texi (GNU Free Documentation License): Adjust.
* NEWS: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix typos.

* NEWS: Fix typos.
* automake.in: Fix typos in comments.  Remove extraneous
whitespace.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Cope with absent Perl modules threads and Thread::Queue.

* automake.in: Instead of `use threads', use `require threads;
import threads' inside a BEGIN section.  Likewise for
Thread::Queue.
* lib/Automake/ChannelDefs.pm (Automake::ChannelDefs): Likewise.
* lib/Automake/tests/Condition-t.pl: Likewise.
* lib/Automake/tests/DisjConditions-t.pl: Likewise.
* configure.ac: Likewise, use `require' and `import'.
Report by Eric Blake, fix suggested by Ben Pfaff.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Multiple 'make uninstall' should not fail even for TEXINFOS.

* lib/am/texinfos.am (uninstall-info-am): Do not fail due to
install-info if the installed file does not exist (any more).
* tests/txinfo26.test: Issue multiple `make uninstall'.
* tests/instmany-mans.test: Likewise.
* tests/instmany-python.test: Likewise.
* tests/instmany.test: Likewise.
* tests/txinfo26.test: Likewise.
* NEWS: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

New public macro AM_SUBST_NOTMAKE.

* m4/substnot.m4 (AM_SUBST_NOTMAKE): New public macro; invoke
_AM_SUBST_NOTMAKE with arguments.
* doc/automake.texi (Optional): Document it.
* NEWS: Update.
* tests/subst4.test: New test.
* tests/Makefile.am: Update.
Suggestion by Bruno Haible.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix regression introduced by AM_DEFAULT_SOURCE_EXT.

* automake.in (handle_source_transform): Use the right variable
when determining whether to apply the old rule for the libtool
library default source name.
Testsuite failure exposed by Bob Proulx' build daemon.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

New maintainer target release-stats.

* Makefile.am (release-stats): New target, to help computing the
entries in the statistics table in automake.texi.
* doc/automake.texi (Releases): Reformat a bit.  Add number of
generated files.  Add entry for 1.10.1.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Choose default source extension: AM_DEFAULT_SOURCE_EXT.

* automake.in (handle_source_transform): Accept unconditional
literal extension in AM_DEFAULT_SOURCE_EXT as override for the
default source extension `.c'.  If set, ignore the old default
source rule for libtool libraries.
* doc/automake.texi (Default _SOURCES): Document this.
* NEWS: Update.
* tests/specflg10.test: New test.
* tests/Makefile.am: Update.
Suggestion by Akim Demaille.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix maintainer-check failure.

* tests/parallel-am.test: Rename variable to not match pattern
used in maintainer-check.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

* NEWS: Fix typo.

Spotted by Jim Meyering.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Parallel automake --add-missing: serialized file installs.

* automake.in (QUEUE_CONF_FILE, QUEUE_LOCATION, QUEUE_STRING):
New serialization keys.
($required_conf_file_queue): New file global.
(queue_required_conf_file, require_queued_conf_file): New
functions, to queue and dequeue requirements for aux dir files.
(require_conf_file): Enqueue if needed.
(get_number_of_threads): Can do threads with --add-missing now.
(handle_makefiles_threaded): Let worker threads enqueue, let
master attend to queued requirements at the right time.
* tests/parallel-am.test: Explain the purpose of the include
chain used here.
* tests/parallel-am2.test: Also cope with --add-missing.
* tests/parallel-am3.test: New test, test absence of races with
concurrent same-file installs stemming from --add-missing.
* tests/Makefile.am: Adjust.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Implement serialization for Locations.

* lib/Automake/Location.pm (serialize, deserialize): New
functions.  They allows to serialize a Location in an array, and
to restore a Location from a thread queue.  The API is
unsymmetric (array vs. queue) because enqueuing data needs to
happen atomically.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Parallel automake: ordered output messages.

* lib/Automake/Channels.pm (%_default_options): New options
`ordered' default enabled, `queue', default zero (no queue),
`queue_key' default undefined.
(_merge_options): Ensure `ordered' channels cannot have fatal
messages or backtrace output.
(_enqueue, _dequeue): New functions, to push messages onto a
Thread::Queue, and output messages from such a queue, suitably
weeded for duplicates in the same manner as _print_message.
(_print_message): If the channel is ordered and has an
associated queue, then enqueue messages instead of printing
them.
(setup_channel_queue, pop_channel_queue): New functions,
to set a Thread::Queue for channels, and to flush a queue.
* lib/Automake/ChannelDefs.pm: Unset channel option `ordered'
for fatal, automake, and verb channels.
* automake.in (QUEUE_MESSAGE): New global constant, used as
serialization key.
(handle_makefiles_threaded): Create message queues for each
input file; workers queue messages, and the master outputs them
ordered, using the new Channels.pm functions.
* tests/parallel-am.test: Also check for ordered output (in the
absence of --add-missing races).
* tests/parallel-am2.test: New test; check for ordered output of
warning and (regular) error messages.
* tests/Makefile.am: Adjust.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Parallel automake execution: AUTOMAKE_JOBS.

* lib/Automake/Config.in (perl_threads): New global.
* automake.in: Use it.  If the perl supports interpreter-based
threading, then use `threads' and `Thread::Queue'.
(handle_makefile, handle_makefiles_serial): New functions,
factored out from main.
(get_number_of_threads): New function, compute number of threads
to use, based on environment variable `AUTOMAKE_JOBS' and number
of independent makefiles.
(handle_makefiles_threaded): New function.  Spawn threads, use
thread queue to distribute handling the different makefiles.
Collect $exit_code values from threads.
(main): Use new functions.
* aclocal.in: No threads here.
* configure.ac: Substitute PERL_THREADS; enabled with perl >=
5.7.2 and when ithreads are available.
* bootstrap (dosubst): Likewise.
* Makefile.am (do_subst): Likewise.
* lib/Automake/Makefile.am (do_subst): Likewise.
* lib/Automake/ChannelDefs.pm: Use `Automake::Config' and
`threads'.
(verb): Prepend thread ID (tid) to verbose messages.
* lib/Automake/Channels.pm (msg): Before exiting, flush stderr,
needed for worker threads.
* lib/Automake/tests/Makefile.am (TESTS_ENVIRONMENT): Also
include the build tree path, so Config.pm is found.
* tests/parallel-am.test: New test.
* tests/Makefile.am: Update.
* doc/automake.texi (Invoking Automake): Document AUTOMAKE_JOBS.
* NEWS, THANKS: Update.
Report about long execution times by Joakim Tjernlund and others.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Minor file checking optimization: set_dir_cache_file.

* lib/Automake/FileUtils.pm (set_dir_cache_file): New function.
* automake.in (require_file_internal): Instead of resetting the
cache when a file has been installed, simply correct the cache
using set_dir_cache_file.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

No uniquifying for fatal, prog_error, and verbose messages.

There is no point in dropping critical messages, even if they
are duplicates (unlikely to happen unless they have been sent
as non-critical messages before), and verbose messages should
enable to show progress, even using duplicate statements.
* lib/Automake/ChannelDefs.pm (fatal, automake, verb): Set
`uniq_part' to `UP_NONE' when registering these channels.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix 'config.status --file=... depfiles' with new Autoconf.

* m4/depout.m4 (_AM_OUTPUT_DEPENDENCY_COMMANDS): Eval
$CONFIG_STATUS contents if we detect the quoting used by
Autoconf 2.62 and newer for --file=.
* tests/depend5.test: New test.
* tests/Makefile.am: Update.
* NEWS, THANKS: Update.
Report by Sam Steingold against gnulib.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Support for Python 3.0, drop support for pre-2.0.

* lib/py-compile: Do not import string; use sys.stdout.write
instead of print, files.split instead of string.split.
* m4/python.m4 (AM_PATH_PYTHON): Also look for python3 and
phython3.0; do not look for python1.5.  Use sys.stdout.write.
(AM_PYTHON_CHECK_VERSION): Do not use string; adjust to xrange
removal in Python 3.0, and changed semantics of map.
* doc/automake.texi (Python, Hard-Coded Install Paths): Update
Python versions mentioned in the manual, using 2.5 everywhere.
* NEWS, THANKS: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Drop unused variable.

* lib/Automake/Channels.pm (@chain): Drop unused variable.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Cleanup of per-input global variables in automake.in.

* automake.in ($output_vars, $output_all, $output_header)
($output_rules, $output_trailer): Fix comment, and sort
declarations in the order they will appear in the output.
($all_target): Unused variable, remove.
(Variables not reset by &initialize_per_input.): New section,
clarify that %am_file_cache is not reset.
(initialize_per_input): Reset $am_file_name, $am_relative_dir,
$in_file_name, $relative_dir, and $topsrcdir to `undef' rather
than the empty string; $topsrcdir was not reset at all.  Sort
remaining variables in the same order as in the section
`Variables reset by &initialize_per_input'.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Let stderr output end up on fd 2 in testsuite.

* tests/defs.in (AUTOMAKE_run): Output recorded stderr on file
descriptor 2.
* tests/getopt.test: Fix erroneous multiple redirection,
uncovered by above change.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix DisjConditions module to be thread-safe for perl >= 5.7.2.

Self-hashes of blessed references are not correctly transported
through thread creation.  This patch fixes that by recreating
the hashes upon thread creation with a CLONE special subroutine,
which is automatically invoked by new enough Perl versions.
* lib/Automake/DisjConditions.pm (CLONE): New special
subroutine to fix self hashes upon thread creation.
* lib/Automake/tests/Condition-t.pl: New, sister test to
Condition.pl, but spawns a new threads after each creation of a
new condition; skip test if perl is too old or ithreads are not
available.
* lib/Automake/tests/DisjConditions-t.pl: Likewise.
* lib/Automake/tests/Makefile.am (TESTS): Add them.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix comment typos.

* automake.in (require_file_internal): Fix typos in comments.
* m4/amversion.in: Likewise.
* lib/Automake/Variable.pm: Likewise.
* lib/Automake/XFile.pm: Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Diagnose unsupported uses of `backname' helper function.

* automake.in (backname): Error out if the path points outside
the directory it started in.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Nicer 'make dist' output.

* lib/am/distdir.am (distdir): Hide the complex script
used for computing the relative subdirs; echo the sub-make
command.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

* tests/defs.in: Fix comment typo.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix grammar w.r.t. plurals in test reports.

* lib/am/check.am: Fix singular/plural forms in test reports.
* tests/check10.test: New test.
* tests/Makefile.am: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Require texi2dvi in tests, makeinfo may not be enough.

* tests/txinfo16.test: RHEL 5.2 has makeinfo and texi2dvi in
separate packages, so also list the latter as required, as the
test generates DVI and/or PDF output (through distcheck).
* tests/txinfo18.test: Likewise.
* tests/txinfo21.test: Likewise.
* tests/txinfo22.test: Likewise.
* tests/txinfo3.test: Likewise.
* tests/version7.test: Likewise.
* THANKS: Update.
Report by Alexander Martens.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix bootstrap to remove read-only directories right.

* bootstrap: Remove automake-$APIVERSION correctly.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Improve test coverage of current TESTS semantics.

* tests/check8.test: New test, for subdir tests and setting of
$srcdir.
* tests/check9.test: New test, check @substituted@ TESTS.
* tests/Makefile.am: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Work around AIX sh quoting issue in AC_PROG_CC_C_O.

* m4/minuso.m4 (AM_PROG_CC_C_O): Work around shell quoting issue
with AIX sh; fixes depcomp6.test failure.
* NEWS, THANKS: Update.
Report by Rainer Tammer.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Print captured output before failing.

* tests/acloca14.test, tests/acloca17.test, tests/acloca18.test,
tests/aclocal.test, tests/acsilent.test, tests/alpha.test,
tests/check4.test, tests/color.test, tests/fn99.test,
tests/fn99subdir.test, tests/help.test, tests/init.test,
tests/lisp8.test, tests/missing3.test, tests/pr220.test,
tests/python11.test, tests/python4.test, tests/python5.test,
tests/unused.test, tests/version8.test: When Exit is called
after a command that has stdout or stderr redirected to a file
for later inspection, output the file before failing the test.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix some comment typos.

* automake.in: Fix some comment typos.
* lib/Automake/Condition.pm: Likewise.
* lib/Automake/DisjConditions.pm: Likewise.
* lib/Automake/Variable.pm: Likewise.
* lib/Automake/tests/DisjConditions.pl: Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

* tests/aclibobj.test: Fix race condition.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix man page creation without installed files.

* doc/Makefile.am (update_mans): Use wrappers in tests/
directory.
($(srcdir)/aclocal-$(APIVERSION).1): Use versioned wrapper as
input program to help2man.
($(srcdir)/automake-$(APIVERSION).1): Likewise.
Report by Eric Blake.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Remove unneeded per-rule *INSTALL variables.

* NEWS: Update.
* lib/am/data.am (%DIR%%PRIMARY%_INSTALL): Remove.
(install-%DIR%%PRIMARY%): Adjust.
* lib/am/libs.am (%DIR%LIBRARIES_INSTALL): Remove.
(install-%DIR%LIBRARIES): Adjust.
* lib/am/ltlibs.am (%DIR%LTLIBRARIES_INSTALL): Remove.
(install-%DIR%LTLIBRARIES): Adjust.
* lib/am/progs.am (%DIR%PROGRAMS_INSTALL): Remove.
(install-%DIR%PROGRAMS): Adjust.
* lib/am/python.am (%DIR%PYTHON_INSTALL): Remove.
(install-%DIR%PYTHON): Adjust.
* lib/am/scripts.am (%DIR%SCRIPT_INSTALL): Remove.
(install-%DIR%SCRIPTS): Adjust.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Compactify program rules using ternary operators.

* lib/am/progs.am (install-%DIR%PROGRAMS): Uglify^WCompactify
using ternary operators `%KEY?TRUE:FALSE%'.
(uninstall-%DIR%PROGRAMS): Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

New doc section about command line length limits.

* doc/automake.texi (Length limitations): New node.
(Alternative): `nobase_' is not always equivalent to several
base variables.
(Install): Mention multi-file install.
* NEWS: Expand on the issue, list some more user-visible
consequences.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Install nobase_lib_LTLIBRARIES before bin_PROGRAMS.

* automake.in (generate_makefile): If nobase_lib_LTLIBRARIES are
used, add an ugly hack to install them before bin_PROGRAMS, just
like done with lib_LTLIBRARIES.
* tests/ltorder.test: Add program, to expose this.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Do not reorder nobase ltlib installation.

This patch changes back the order of installation of nobase
LTLIBRARIES to that in which files are listed in the variables.
It does not fix the issue of strict dependency ordering, as
implied by *_LIBADD, but as before allows to steer the order by
listing the libraries in nobase_*_LTLIBRARIES appropriately.

As an advantage over the state of 1.10, multiple consecutive
nobase libraries to be installed in the same directory are
passed to libtool in one invocation.

* lib/am/ltlib.am (install-%DIR%LTLIBRARIES) [!%?BASE%]: Do not
reorder libraries upon installation.  Remove spurious empty
line.
* tests/ltorder.test: New test.
* tests/Makefile.am: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix -rpath arguments for nobase_*_LTLIBRARIES.

* automake.in (handle_ltlibraries): New hash %instsubdirs to
track the dirname of nobase ltlibraries, and tack it onto the
end of the -rpath argument.  Also, fix the warning about ltlibs
installed in multiple locations to fit a bit better.
* tests/pr300-ltlib.test: Expose this bug here.
* tests/ltinstloc.test: New test.
* tests/Makefile.am: Update.
* NEWS: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Man pages for automake and aclocal.

* configure.ac (HELP2MAN): New substitution.
* doc/Makefile.am (dist_man1_MANS, MAINTAINERCLEANFILES)
(update_mans): New macros.
($(srcdir)/aclocal-$(APIVERSION).1)
($(srcdir)/automake-$(APIVERSION).1): New rules, generate
man pages from the command line help with help2man.
($(srcdir)/aclocal.1, $(srcdir)/automake.1): New rules, for
`.so' man page links to the versioned pages.
* NEWS: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

install: cope with non-injective $(transform).

* lib/am/progs.am (install-%DIR%PROGRAMS): Rewrite rule to not
try to use the installed name as key in a hash, so destructive
$(transform) scripts still work.
* lib/am/scripts.am (install-%DIR%SCRIPTS): Likewise.
* tests/transform.test: Fix test to look in right place for
installed files.
* tests/transform2.test: New test.
* tests/Makefile.am: Adjust.
Report by Jim Meyering.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Faster install for libtool outputs.

* lib/am/ltlib.am (install-%DIR%LTLIBRARIES): Invoke `libtool
--mode=install' with multiple libraries at once.
(%DIR%LTLIBRARIES_INSTALL): No need to use install_sh any more.
* lib/am/progs.am (install-%DIR%PROGRAMS): Likewise, remove much
of the libtool special-casing by invoking it for multiple
programs at once.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fast install and uninstall for SCRIPTS.

* lib/am/scripts.am [%?INSTALL%]: Include inst-vars.am
independent of `%?BASE%'.
(install-%DIR%SCRIPTS): Install multiple scripts at once,
using awk and a number of sed scripts.
(uninstall-%DIR%SCRIPTS): Compute the installed names, and
remove them, all at once.
(%DIR%SCRIPT_INSTALL) [!BASE]: No need to use install-sh any
more.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Multi-file install for PROGRAMS.

* lib/am/progs.am (install-%DIR%PROGRAMS): Allow to install
several programs with one install invocation, when not using
libtool; employs some trickery to cater for nobase_, $(EXEEXT),
create needed directories, libtool, while only forking a
constant number of times in the fast path; uses awk and sed also
in the default path.
(%DIR%PROGRAMS_INSTALL) [!BASE]: No need to use install-sh any
more.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Enhance cleaning of programs in libtool mode.

* lib/am/progs.am (clean-%DIR%PROGRAMS) [?LIBTOOL?]: Fork less
often, avoid removing programs twice if $(EXEEXT) is empty.
* tests/nobase-libtool.test: Also test PROGRAMS, in order to
exercise the code path.
* THANKS: Update.
Report by Toralf Förster.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Reliable multi-file install for man pages.

* lib/am/mans.am: Include inst-vars.am.
(install-man%SECTION%): Gather lists of man pages to install,
and install up to 40 of those that do not have to be renamed
at once.  Fail if installation of any file fails.
(uninstall-man%SECTION%): Rewrite to use fewer sed invocations.
* doc/automake.texi (Man pages): Hint the user to the fast path.
Indentation fix.
* tests/instmany-mans.test: New test.
* tests/Makefile.am: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Faster `make uninstall'; fast install for JAVA.

* lib/am/inst-vars.am (am__nobase_strip_setup)
(am__nobase_strip): New macros.
(am__nobase_list): Factorize.
* lib/am/data.am (uninstall-%DIR%%PRIMARY%): Use them, for a
constant number of forks per uninstall.
* lib/am/libs.am (uninstall-%DIR%LIBRARIES): Likewise.
* lib/am/lisp.am (uninstall-%DIR%LISP): Likewise.
* lib/am/progs.am (uninstall-%DIR%PROGRAMS): Fast uninstall.
* lib/am/python.am (uninstall-%DIR%PYTHON): Fast uninstall.
Echo all `rm' commands that are are executed.
* lib/am/java.am (install-%DIR%JAVA, uninstall-%DIR%JAVA):
Fast install and uninstall.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

AIX ranlib dislikes spaces in the argument.

* lib/am/libs.am (install-%DIR%LIBRARIES): Fix instsh.test
failure on AIX due to ranlib and whitespace in the directory.
* THANKS: Update.
Report by John F Trudeau.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fail upon install or ranlib failure, part two.

* lib/am/java.am (install-%DIR%JAVA): Fail upon install failure.
* lib/am/lisp.am (install-%DIR%LISP): Likewise.
* lib/am/ltlib.am (install-%DIR%LTLIBRARIES): Likewise.
* lib/am/libs.am (install-%DIR%LIBRARIES): Likewise, for
`install' as well as `ranlib'.
* lib/am/progs.am (install-%DIR%PROGRAMS): If `install' fails,
return its exit failure, not 1.
* tests/instfail.test: New test, for PROGRAMS (without libtool),
LIBRARIES, including nobase variants.
* tests/instfail-info.test: Likewise, for TEXINFOS.
* tests/instfail-java.test: Likewise, for JAVA.
* tests/instfail-libtool.test: Likewise, for PROGRAMS (with
libtool) and LTLIBRARIES.
* tests/Makefile.am: Adjust.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Exit upon `install' failure, part one.

* lib/am/data.am (install-%DIR%%PRIMARY%): Exit if any install
command fails.
* lib/am/python.am (install-%DIR%PYTHON): Likewise.
* lib/am/scripts.am (install-%DIR%SCRIPTS): Likewise.
* lib/am/texinfos.am (install-dvi-am, install-html-am)
(install-info-am:, install-pdf-am): Likewise.
* tests/instmany.test: New test, for SCRIPTS, DATA, and HEADERS.
* tests/instmany-python.test: New test, for PYTHON.
* tests/Makefile.am: Adjust.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix multi-file installation for files in srcdir.

For files that can live in the build tree or the source tree,
we have to expect that prepending `$(srcdir)/' to each name
will let the install command line exceed length limitations.
Thus use a new macro, $(am__base_list), to install in chunks
of 40 files, similar to what we do for nobase_* files.  There,
lower the limit to 40, too.

* lib/am/inst-vars.am (am__install_max): Lower to 40.
(am__base_list): New macro.
* lib/am/data.am (install-%DIR%%PRIMARY%) [%?BASE%]: Use it.
* lib/am/texinfos.am (install-dvi-am, install-html-am)
(install-info-am, install-pdf-am, install-ps-am): Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Use `Exit' instead of `exit' in test suite.

Cater to Bourne shells like Solaris sh that do not pass the
`exit' argument as status to the cleanup trap.
* Makefile.am (maintainer-check): Check that here-documents
use only `END' or `EOF' as delimiter in the test suite.
Check that, outside of here-documents, the tests do not use
`exit' with an argument, but use `Exit' instead.
* tests/defs.in (Exit): New function.  Use it throughout,
starting with the introduction of the exit trap.
* tests/*.test: Use `Exit $arg' instead of `exit $arg'
throughout, except inside created files.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Avoid Heisenbug with verbose testing on HP-UX.

* tests/output-order.test: Remove spurious redirection line
from output for comparison.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

For all possibly-relative subdirs, use $(am__cd).

Up to now, $(am__cd) was only used within backquotes, to avoid
extraneous output.  This patch also uses it for every `cd' to a
relative subdir, to prevent CDPATH from entering an unwanted
directory.
* Makefile.am (maintainer-check): Fix current check for
$(am__cd) within backquotes a bit.  Add new check for `cd' to a
relative subdir.
* automake.in (handle_tags, handle_configure):  Adjust rules.
* lib/am/ansi2knr.am: Likewise.
* lib/am/configure.am: Likewise.
* lib/am/distdir.am: Likewise.
* lib/am/remake-hdr.am: Likewise.
* lib/am/subdirs.am: Likewise.
* lib/am/tags.am: Likewise.
* lib/am/texibuild.am: Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix nobase-python.test for BSD make.

* tests/nobase-python.test: Listing a dependency to be found
via VPATH search explicitly, without the path, as a target,
will turn off VPATH search for FreeBSD make.  So move the
creation of the files outside of the Makefile.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Implement AM_MAINTAINER_MODE([DEFAULT-MODE]).

* m4/maintainer.m4 (AM_MAINTAINER_MODE): Allow for an optional
first argument of `enable' or `disable', setting the default.
* doc/automake.texi (Optional, maintainer-mode): Document.
* tests/mmode.test: New test.
* tests/Makefile.am: Adjust.
* NEWS: Update.
Suggestion by Vincent Lefevre.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Copyright year updates.

* lib/am/header-vars.am: Update copyright years.
* lib/am/remake-hdr.am: Likewise.
* lib/am/tags.am: Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

* THANKS: Use Cyrillic name instead of ASCII transcription.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix rebuilding of removed subdir/Makefile.in files.

* lib/am/configure.am (%MAKEFILE-IN%) [?!TOPDIR_P?]: If
subdir/Makefile.in was removed, am--refresh would not update
it.  Fix up for it by running the per-directory rebuild rule.
* tests/remake6.test, tests/remake6.test: New tests.
* tests/Makefile.am: Adjust.
* NEWS, THANKS: Update.
Report and initial patch by Ilya N. Golubev.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

* tests/notrans.test: Use multiple man files of each type.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix maintainer-check failures.

* doc/automake.texi (Conditionals): Drop TAB.
* tests/missing6.test: Use 'rm -f'.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix grammaros.

* doc/automake.texi (Flag Variables Ordering, Per-Object Flags):
Fix grammaros.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

* lib/gnupload: Provide also a simple example.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Small doc fix

* doc/automake.texi (Public Macros): Close open paren.

Signed-off-by: Thien-Thi Nguyen <ttn@gnuvola.org>

Introduce macro $(am__mv) to facilitate 'libtool --dry-run'.

* lib/am/depend.am (am__mv): New macro, set to 'mv -f'.
* lib/am/depend2.am: Use throughout to move the temporary
depfile *.Tpo to its final destination *.Po.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix ChangeLog entry.

* config-ml.in: don't handle --enable-shared and --enable-static.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

New variable am__install_max.

* lib/am/inst-vars.am (am__install_max): New variable.
(am__nobase_list): Use it.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix conditional rules competing with config.status rules.

* automake.in (handle_configure): Teach targets about the
conditional config.status rule.
* tests/cond39.test: Adjust test to expose this.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

For AC_CONFIG_LINKS(X,X), do not clean X in a non-VPATH build.

* automake.in (rewrite_inputs_into_dependencies): Do distribute
inputs where input and output name are equal.  This relies on
the assumption that it only happens with AC_CONFIG_LINKS.
(handle_configure) <CONFIG_CLEAN_VPATH_FILES>: New variable, for
links where source and dest are equal.
* lib/am/clean.am (distclean-generic): Remove, if build tree not
equal source tree.
* tests/conflnk4.test: New test.
* tests/Makefile.am: Adjust.
* NEWS: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

git metadata update.

* .gitattributes: Use merge-changelog driver for ChangeLog.
* .gitignore: Ignore configure.lineno, config.status.lineno.

Fix ambivalent wording introduced with last patch.

* doc/automake.texi (Extending): Fix ambivalent wording.
Report by Ben Pfaff.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Improve description of -local and -hook targets.

* doc/automake.texi (Install, Hard-Coded Install Paths):  Fix
punctuation and markup.
(Extending): Improve wording and clarify order semantics of
*-local and *-hook targets.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix grammar error in manual.

* doc/automake.texi (Extending): Fix grammar.
Report by Karl Berry.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix typos.

* doc/automake.texi (Timeline): Reported by Reuben Thomas.
* lib/am/remake-hdr.am: A few typos in comments.

Signed-off-by: Stepan Kasal <skasal@redhat.com>

Prefer a released version of autoconf.

* NEWS: Bump requirement to autoconf 2.62.
* m4/init.m4 (AM_INIT_AUTOMAKE): Likewise.
* configure.ac: Likewise.
(AC_PREREQ): Remove check, done by AM_INIT_AUTOMAKE instead.

Signed-off-by: Eric Blake <ebb9@byu.net>

AC_AUTOCONF_VERSION can inadvertently expand to a macro name.

* m4/amversion.in (AM_SET_CURRENT_AUTOMAKE_VERSION): Use proper
m4 quoting.
* aclocal.in (write_aclocal): Likewise.
* tests/missing6.test: New test.
* tests/Makefile.am (TESTS): Run it.
* tests/missing4.test: Adjust.

Signed-off-by: Eric Blake <ebb9@byu.net>

Make gnupload friendlier for VPATH usage.

* lib/gnupload: Allow uploads from separate directory.

Signed-off-by: Eric Blake <ebb9@byu.net>

Implement conditional AC_CONFIG_FILES: AM_COND_IF.

* automake.in (%ac_config_files_condition): New.
(scan_autoconf_config_files): Record condition if any.
(scan_autoconf_traces): Trace _AM_COND_IF, _AM_COND_ELSE,
_AM_COND_ENDIF, updating @cond_stack as appropriate.
(handle_configure): Prefix config.status rule with condition.
Check that m4 quotation is done consistently.
* m4/cond.m4 (AM_CONDITION): Define `_AM_COND_VALUE_name'
with `name' being the name of the condition, to its shell
condition.
* m4/cond-if.m4: New file.
(_AM_COND_IF, _AM_COND_ELSE, _AM_COND_ENDIF): New trace helpers.
(AM_COND_IF): New macro, implements conditionals.
* m4/Makefile.am: Adjust.
* doc/automake.texi (Requirements, Optional, Conditionals):
Document AM_COND_IF.
* NEWS: Update.
* tests/cond39.test, tests/cond40.test, tests/cond41.test,
tests/cond42.test, tests/cond43.test: New tests.
* tests/Makefile.am: Adjust.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Introduce @ovar from Autoconf.

* doc/automake.texi (@ovar): New macro, from autoconf.texi.
(Python): Use it.
Suggestion by Eric Blake.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

* lib/texinfo.tex: Sync from upstream.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Fix nits in the manual.

* doc/automake.texi (Requirements, Linking, Extending):
Fix underfull and overfull lines, fix wording a bit.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Sync auxiliary files from upstream.

* lib/config.guess, lib/config.sub, lib/texinfo.tex: Sync from
upstream.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Pull config.guess and config.sub from upstream git repo now.

* Makefile.am (WGET_SV_GIT_CF): New.
(fetch): Pull config.guess and config.sub from git repo now.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

New function xsystem_hint, for autoreconf.

* lib/Autom4te/FileUtils.pm (handle_exec_errors): New argument
$hint, show if the executing program does not exist.
(xsystem_hint): New function, like xsystem but allows to pass
a hint.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Implement the `notrans_' prefix for untransformed manpages.

* automake.in (handle_man_pages), lib/am/mans.am: Implement
notrans_ prefix for MANS primary and rework dependencies for
install-man%SECTION%; use only vars defined in Makefile.am.
* doc/automake.texi (Renaming, Uniform, Man pages):
Document notrans_ prefix.
* NEWS: Update.
* tests/notrans.test: New test.
* tests/Makefile.am: Update.