platform/upstream/automake.git
15 years agoNew doc section about command line length limits.
Ralf Wildenhues [Sat, 20 Sep 2008 12:27:10 +0000 (14:27 +0200)]
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>
15 years agoInstall nobase_lib_LTLIBRARIES before bin_PROGRAMS.
Ralf Wildenhues [Sat, 20 Sep 2008 11:02:23 +0000 (13:02 +0200)]
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>
15 years agoDo not reorder nobase ltlib installation.
Ralf Wildenhues [Sat, 20 Sep 2008 10:30:48 +0000 (12:30 +0200)]
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>
15 years agoFix -rpath arguments for nobase_*_LTLIBRARIES.
Ralf Wildenhues [Sat, 20 Sep 2008 10:12:42 +0000 (12:12 +0200)]
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>
15 years agoMan pages for automake and aclocal.
Ralf Wildenhues [Sat, 20 Sep 2008 09:42:31 +0000 (11:42 +0200)]
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>
15 years agoinstall: cope with non-injective $(transform).
Ralf Wildenhues [Sat, 13 Sep 2008 07:55:23 +0000 (09:55 +0200)]
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>
15 years agoFaster install for libtool outputs.
Ralf Wildenhues [Sat, 13 Sep 2008 07:32:13 +0000 (09:32 +0200)]
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>
15 years agoFast install and uninstall for SCRIPTS.
Ralf Wildenhues [Sun, 7 Sep 2008 09:10:26 +0000 (11:10 +0200)]
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>
15 years agoMulti-file install for PROGRAMS.
Ralf Wildenhues [Sun, 7 Sep 2008 08:56:19 +0000 (10:56 +0200)]
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>
15 years agoEnhance cleaning of programs in libtool mode.
Ralf Wildenhues [Sun, 7 Sep 2008 08:43:33 +0000 (10:43 +0200)]
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>
15 years agoReliable multi-file install for man pages.
Ralf Wildenhues [Sun, 7 Sep 2008 07:59:52 +0000 (09:59 +0200)]
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>
15 years agoFaster `make uninstall'; fast install for JAVA.
Ralf Wildenhues [Sun, 7 Sep 2008 07:25:02 +0000 (09:25 +0200)]
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>
15 years agoAIX ranlib dislikes spaces in the argument.
Ralf Wildenhues [Sun, 7 Sep 2008 07:11:34 +0000 (09:11 +0200)]
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>
15 years agoFail upon install or ranlib failure, part two.
Ralf Wildenhues [Sun, 7 Sep 2008 06:42:47 +0000 (08:42 +0200)]
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>
15 years agoExit upon `install' failure, part one.
Ralf Wildenhues [Sat, 6 Sep 2008 22:43:38 +0000 (00:43 +0200)]
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>
15 years agoFix multi-file installation for files in srcdir.
Ralf Wildenhues [Sat, 6 Sep 2008 21:40:34 +0000 (23:40 +0200)]
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>
15 years agoUse `Exit' instead of `exit' in test suite.
Ralf Wildenhues [Sat, 6 Sep 2008 17:20:32 +0000 (19:20 +0200)]
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>
15 years agoAvoid Heisenbug with verbose testing on HP-UX.
Ralf Wildenhues [Thu, 4 Sep 2008 20:13:36 +0000 (22:13 +0200)]
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>
15 years agoFor all possibly-relative subdirs, use $(am__cd).
Ralf Wildenhues [Thu, 4 Sep 2008 20:04:37 +0000 (22:04 +0200)]
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>
15 years agoFix nobase-python.test for BSD make.
Ralf Wildenhues [Thu, 4 Sep 2008 19:52:29 +0000 (21:52 +0200)]
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>
15 years agoImplement AM_MAINTAINER_MODE([DEFAULT-MODE]).
Ralf Wildenhues [Mon, 1 Sep 2008 18:29:58 +0000 (20:29 +0200)]
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>
15 years agoCopyright year updates.
Ralf Wildenhues [Sun, 31 Aug 2008 06:23:24 +0000 (08:23 +0200)]
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>
15 years ago* THANKS: Use Cyrillic name instead of ASCII transcription.
Ralf Wildenhues [Thu, 28 Aug 2008 18:31:37 +0000 (20:31 +0200)]
* THANKS: Use Cyrillic name instead of ASCII transcription.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix rebuilding of removed subdir/Makefile.in files.
Ralf Wildenhues [Fri, 22 Aug 2008 11:19:04 +0000 (13:19 +0200)]
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>
15 years ago* tests/notrans.test: Use multiple man files of each type.
Ralf Wildenhues [Tue, 19 Aug 2008 21:20:32 +0000 (23:20 +0200)]
* tests/notrans.test: Use multiple man files of each type.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years agoFix maintainer-check failures.
Ralf Wildenhues [Tue, 19 Aug 2008 21:03:57 +0000 (23:03 +0200)]
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>
15 years agoFix grammaros.
Reuben Thomas [Tue, 19 Aug 2008 20:53:32 +0000 (22:53 +0200)]
Fix grammaros.

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

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
15 years ago* lib/gnupload: Provide also a simple example.
Karl Berry [Sat, 2 Aug 2008 09:41:23 +0000 (11:41 +0200)]
* lib/gnupload: Provide also a simple example.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
16 years agoSmall doc fix
Thien-Thi Nguyen [Wed, 25 Jun 2008 04:13:44 +0000 (06:13 +0200)]
Small doc fix

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

Signed-off-by: Thien-Thi Nguyen <ttn@gnuvola.org>
16 years agoIntroduce macro $(am__mv) to facilitate 'libtool --dry-run'.
Ralf Wildenhues [Tue, 17 Jun 2008 22:37:42 +0000 (00:37 +0200)]
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>
16 years agoFix ChangeLog entry.
Ralf Wildenhues [Tue, 17 Jun 2008 22:37:17 +0000 (00:37 +0200)]
Fix ChangeLog entry.

16 years ago* config-ml.in: don't handle --enable-shared and --enable-static.
Rafael Espindola [Tue, 17 Jun 2008 22:21:56 +0000 (00:21 +0200)]
* config-ml.in: don't handle --enable-shared and --enable-static.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
16 years agoNew variable am__install_max.
Ralf Wildenhues [Tue, 17 Jun 2008 22:19:16 +0000 (00:19 +0200)]
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>
16 years agoFix conditional rules competing with config.status rules.
Ralf Wildenhues [Tue, 17 Jun 2008 22:16:25 +0000 (00:16 +0200)]
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>
16 years agoFor AC_CONFIG_LINKS(X,X), do not clean X in a non-VPATH build.
Ralf Wildenhues [Tue, 17 Jun 2008 22:11:36 +0000 (00:11 +0200)]
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>
16 years agogit metadata update.
Ralf Wildenhues [Mon, 16 Jun 2008 17:36:25 +0000 (19:36 +0200)]
git metadata update.

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

16 years agoFix ambivalent wording introduced with last patch.
Ralf Wildenhues [Fri, 6 Jun 2008 05:53:17 +0000 (07:53 +0200)]
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>
16 years agoImprove description of -local and -hook targets.
Karl Berry [Wed, 4 Jun 2008 18:45:56 +0000 (20:45 +0200)]
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>
16 years agoFix grammar error in manual.
Ralf Wildenhues [Sun, 1 Jun 2008 08:06:59 +0000 (10:06 +0200)]
Fix grammar error in manual.

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

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
16 years agoFix typos.
Stepan Kasal [Tue, 13 May 2008 12:46:39 +0000 (14:46 +0200)]
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>
16 years agoPrefer a released version of autoconf.
Eric Blake [Thu, 10 Apr 2008 22:47:55 +0000 (16:47 -0600)]
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>
16 years agoAC_AUTOCONF_VERSION can inadvertently expand to a macro name.
Eric Blake [Thu, 10 Apr 2008 15:51:23 +0000 (09:51 -0600)]
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>
16 years agoMake gnupload friendlier for VPATH usage.
Eric Blake [Wed, 2 Apr 2008 19:43:56 +0000 (13:43 -0600)]
Make gnupload friendlier for VPATH usage.

* lib/gnupload: Allow uploads from separate directory.

Signed-off-by: Eric Blake <ebb9@byu.net>
16 years agoImplement conditional AC_CONFIG_FILES: AM_COND_IF.
Ralf Wildenhues [Wed, 26 Mar 2008 06:00:44 +0000 (07:00 +0100)]
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>
16 years agoIntroduce @ovar from Autoconf.
Ralf Wildenhues [Mon, 24 Mar 2008 11:03:54 +0000 (12:03 +0100)]
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>
16 years ago* lib/texinfo.tex: Sync from upstream.
Ralf Wildenhues [Thu, 20 Mar 2008 19:04:09 +0000 (20:04 +0100)]
* lib/texinfo.tex: Sync from upstream.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
16 years agoFix nits in the manual.
Ralf Wildenhues [Mon, 17 Mar 2008 06:14:29 +0000 (07:14 +0100)]
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>
16 years agoSync auxiliary files from upstream.
Ralf Wildenhues [Mon, 17 Mar 2008 06:09:45 +0000 (07:09 +0100)]
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>
16 years agoPull config.guess and config.sub from upstream git repo now.
Ralf Wildenhues [Mon, 17 Mar 2008 06:07:58 +0000 (07:07 +0100)]
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>
16 years agoNew function xsystem_hint, for autoreconf.
Ralf Wildenhues [Mon, 17 Mar 2008 05:49:44 +0000 (06:49 +0100)]
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>
16 years agoImplement the `notrans_' prefix for untransformed manpages.
Peter Breitenlohner [Tue, 11 Mar 2008 21:26:27 +0000 (22:26 +0100)]
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.

16 years ago* automake.in (handle_man_pages): Reindent, for next patch.
Peter Breitenlohner [Tue, 11 Mar 2008 21:08:42 +0000 (22:08 +0100)]
* automake.in (handle_man_pages): Reindent, for next patch.

16 years agoExploit `install' with multiple files at once for some file types.
Ralf Wildenhues [Sat, 8 Mar 2008 12:58:18 +0000 (13:58 +0100)]
Exploit `install' with multiple files at once for some file types.

With nobase targets, at most 50 files are installed at once,
to avoid quadratic string concatenation and line length limits.
This isn't yet done with base targets.  One hope is that there,
the typical file name length is lower.  If this turns out to be
a problem, it should be revisited.

* lib/am/inst-vars.am (am__nobase_list): New helper macro for
installation of multiple nobase files at once: sorts and lists
files keyed by their target directory.
* lib/am/data.am (%DIR%%PRIMARY%_INSTALL): No need to set it to
$(install_sh_DATA) any more, not even for nobase targets.
(install-%DIR%%PRIMARY%): Split base and nobase cases.
Rewrite to pass lists of files which all go in the same
directory to `install'.  In the nobase case, make use of
$(am__nobase_list) and $(MKDIR_P) each directory before
populating it.  Take care of files in source and build trees,
and avoid creating directories where no files are to be
installed.
* lib/am/libs.am (%DIR%LIBRARIES_INSTALL): Likewise.
(install-%DIR%LIBRARIES): Likewise.
* lib/am/python.am (%DIR%PYTHON_INSTALL): Likewise.
(install-%DIR%PYTHON): Likewise.  Also take care to keep note of
a list for byte compilation after installation.
* lib/am/texinfos.am (install-dvi-am, install-html-am)
(install-info-am, install-pdf-am, install-ps-am): Use file lists
to install multiple files at once.
* NEWS: Update.
Suggested by Akim Demaille.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
16 years agoRequire unreleased Autoconf for fixed AC_PROG_INSTALL.
Ralf Wildenhues [Sat, 8 Mar 2008 12:35:05 +0000 (13:35 +0100)]
Require unreleased Autoconf for fixed AC_PROG_INSTALL.

* m4/init.m4 (AM_INIT_AUTOMAKE): Bump AC_PREREQ to 2.61-341,
regenerate files.
* configure.ac: Also require Autoconf 2.61-341, to catch
failure early and provide a sensible error message.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
16 years agoAdd support for newer Fortran extensions '.[fF]0[38]'.
Ralf Wildenhues [Sat, 8 Mar 2008 12:20:20 +0000 (13:20 +0100)]
Add support for newer Fortran extensions '.[fF]0[38]'.

* automake.in (scan_autoconf_traces): Accept .f03, .f08 for
Fortran, .F03 and .F08 for preprocessed Fortran files.
Use $(FCFLAGS_f[09]x) accordingly.
* doc/automake.texi (Compiling Fortran 9x Files): Update.
* tests/fort2.test: Add more tests.
* NEWS: Update.

16 years agoDrop usage of obsolete macros AC_EXEEXT and AC_OBJEXT.
Ralf Wildenhues [Sat, 8 Mar 2008 12:16:03 +0000 (13:16 +0100)]
Drop usage of obsolete macros AC_EXEEXT and AC_OBJEXT.

* tests/ansi4.test: Drop AC_OBJEXT and AC_EXEEXT.
* tests/ansi6.test: Likewise.
* tests/ansi7.test: Likewise.
* tests/condlib.test: Likewise.
* tests/cygwin32.test: Likewise.
* tests/exeext2.test: Likewise.
* tests/libobj11.test: Likewise.
* tests/library.test: Likewise.
* tests/txinfo5.test: Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
16 years agoSkip instsh3.test if `touch -t' does not work.
Ralf Wildenhues [Mon, 3 Mar 2008 22:02:58 +0000 (23:02 +0100)]
Skip instsh3.test if `touch -t' does not work.

* tests/instsh3.test: Test for `touch -t', fails with Solaris
/usr/ucb/touch.
* THANKS: Update.
Report by Younes Younes.

16 years ago* doc/automake.texi (wildcards): Improve "Why doesn't Automake
Reuben Thomas [Wed, 27 Feb 2008 06:53:02 +0000 (07:53 +0100)]
* doc/automake.texi (wildcards): Improve "Why doesn't Automake
support wildcards" node's English and sense.

16 years agoFix XFAIL_TESTS matching for NetBSD ksh.
Ralf Wildenhues [Sat, 23 Feb 2008 09:47:20 +0000 (10:47 +0100)]
Fix XFAIL_TESTS matching for NetBSD ksh.

* lib/am/check.am (check-TESTS): In the case patterns for
XFAILed tests, add literal bracket expression for matching
whitespace, as NetBSD 4.99.54 ksh does not understand a
bracket expression resulting from variable expansion.
* README: Explain how to run the Automake test suite, including
setting MAKE to test gmake.
Report by Patrick Welche.

16 years agoPR automake/498
Ralf Wildenhues [Tue, 19 Feb 2008 21:15:03 +0000 (22:15 +0100)]
PR automake/498
* m4/options.m4 (_AM_SET_OPTIONS): Use m4_foreach_w instead of
obsolete AC_FOREACH.
Report by NightStrike and gurganbl@rose-hulman.edu.

16 years agoRegenerate.
Ralf Wildenhues [Tue, 19 Feb 2008 21:14:50 +0000 (22:14 +0100)]
Regenerate.

16 years ago* lib/am/tags.am (ID): Fix typo in workaround for old awk.
Colin Watson [Sun, 17 Feb 2008 18:07:32 +0000 (19:07 +0100)]
* lib/am/tags.am (ID): Fix typo in workaround for old awk.

16 years ago* doc/.gitignore: Ignore files generated by `make ps pdf html'.
Ralf Wildenhues [Tue, 5 Feb 2008 20:05:57 +0000 (21:05 +0100)]
* doc/.gitignore: Ignore files generated by `make ps pdf html'.

16 years agoFix minor doc issues in node `CVS'.
Reuben Thomas [Tue, 5 Feb 2008 20:02:45 +0000 (21:02 +0100)]
Fix minor doc issues in node `CVS'.

* doc/automake.texi (CVS): configure.ac will appear newer, not
older, than configure.  Use `lexical' instead of `alphabetical'.

16 years ago* tests/man3.test: Avoid `make VAR=value'.
Ralf Wildenhues [Wed, 30 Jan 2008 20:59:27 +0000 (21:59 +0100)]
* tests/man3.test: Avoid `make VAR=value'.

16 years ago* tests/subst3.test: New test.
Ralf Wildenhues [Wed, 30 Jan 2008 20:40:57 +0000 (21:40 +0100)]
* tests/subst3.test: New test.
* tests/Makefile.am: Update.

16 years agoSplit instsh2.test, so that only the new part requires non-root.
Ralf Wildenhues [Wed, 30 Jan 2008 20:23:16 +0000 (21:23 +0100)]
Split instsh2.test, so that only the new part requires non-root.

* tests/instsh2.test: Split off testing of `install-sh -C' ...
* tests/instsh3.test: ... to this new test, requiring non-root.
* tests/Makefile.am: Adjust.
* THANKS: Update.
Report by Theodoros V. Kalamatianos.

16 years ago* tests/nobase.test: Extend test to generated files.
Ralf Wildenhues [Wed, 23 Jan 2008 22:42:07 +0000 (23:42 +0100)]
* tests/nobase.test: Extend test to generated files.

16 years agoNew test nobase-python.test.
Ralf Wildenhues [Wed, 23 Jan 2008 22:40:57 +0000 (23:40 +0100)]
New test nobase-python.test.

* tests/nobase-python.test: New test, nobase for python files.
* tests/Makefile.am: Update.

16 years agoSplit libtool part off of nobase.test.
Ralf Wildenhues [Wed, 23 Jan 2008 22:38:34 +0000 (23:38 +0100)]
Split libtool part off of nobase.test.

* tests/nobase.test: Split off libtool part of nobase.test for
increased test exposure, to ...
* tests/nobase-libtool.test: ... this new test.
* tests/Makefile.am: Update.

16 years agoFix color.test when using BSD grep.
Eric Blake [Wed, 23 Jan 2008 17:03:58 +0000 (10:03 -0700)]
Fix color.test when using BSD grep.

* tests/color.test: Ensure that grep can handle non-printing
characters.

Signed-off-by: Eric Blake <ebb9@byu.net>
16 years ago* tests/lisp3.test: Fix typo.
Ralf Wildenhues [Wed, 23 Jan 2008 06:50:28 +0000 (07:50 +0100)]
* tests/lisp3.test: Fix typo.

16 years agoPrefer generated manpages over distributed ones.
Ralf Wildenhues [Tue, 22 Jan 2008 22:35:57 +0000 (23:35 +0100)]
Prefer generated manpages over distributed ones.

* lib/am/mans.am (install-man%SECTION%): Prefer generated manpages
over distributed ones.
Report and patch by Peter Breitenlohner.
* tests/man3.test: New test.
* tests/Makefile.am: Update.

16 years ago* tests/tar.test: Skip if no appropriate tar was found.
Ralf Wildenhues [Mon, 21 Jan 2008 21:51:03 +0000 (22:51 +0100)]
* tests/tar.test: Skip if no appropriate tar was found.

16 years ago* doc/automake.texi (Dependency Tracking): Fix typo.
NightStrike [Sat, 19 Jan 2008 09:58:06 +0000 (10:58 +0100)]
* doc/automake.texi (Dependency Tracking): Fix typo.

16 years ago* lib/config-ml.in, lib/config.guess, lib/config.sub, lib/symlink-tree: Sync from...
Ralf Wildenhues [Sat, 19 Jan 2008 09:51:25 +0000 (10:51 +0100)]
* lib/config-ml.in, lib/config.guess, lib/config.sub, lib/symlink-tree: Sync from upstream.

16 years agoFix `fetch' target to match current upstream locations.
Ralf Wildenhues [Sat, 8 Dec 2007 10:06:03 +0000 (11:06 +0100)]
Fix `fetch' target to match current upstream locations.

* Makefile.am (WGET_SV_CVS): Renamed from WGETSGO.
(WGET_SV_GIT_AC, WGET_SV_GIT_GL, WGET_GCC): New.
(fetch): Update to match current upstream locations.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
16 years ago* doc/automake.texi (DESTDIR, Built sources example): Fix wording.
Ralf Wildenhues [Mon, 14 Jan 2008 21:42:33 +0000 (22:42 +0100)]
* doc/automake.texi (DESTDIR, Built sources example): Fix wording.
* THANKS: Update.
Reports and suggestions by William Pursell and nightstrike@gmail.com.

16 years agoFix permissions of config.sub
Ralf Wildenhues [Sun, 13 Jan 2008 17:06:56 +0000 (18:06 +0100)]
Fix permissions of config.sub

16 years agoDo not fail if `autoupdate' is not present.
Ralf Wildenhues [Sun, 13 Jan 2008 17:05:44 +0000 (18:05 +0100)]
Do not fail if `autoupdate' is not present.

* tests/obsolete.test: Check for presence of autoupdate.  Apparently,
FreeBSD may install the other Autoconf programs without a version
suffix but not autoupdate.

16 years agoFix Heisenbug trying to unset a sometimes-not-set variable.
Ralf Wildenhues [Sun, 13 Jan 2008 17:05:04 +0000 (18:05 +0100)]
Fix Heisenbug trying to unset a sometimes-not-set variable.

* tests/check5.test: Do not error out upon `unset TESTS' due to
`set -e', in case TESTS was not set.
* tests/color.test: Likewise.

16 years ago* doc/automake.texi (amhello Explained): Fix odd sentence.
Ralf Wildenhues [Sun, 13 Jan 2008 17:04:16 +0000 (18:04 +0100)]
* doc/automake.texi (amhello Explained): Fix odd sentence.
Report by nightstrike@gmail.com.

16 years ago* m4/init.m4 (_AC_AM_CONFIG_HEADER_HOOK): Rewrite to be more
Ralf Wildenhues [Sat, 12 Jan 2008 14:33:06 +0000 (15:33 +0100)]
* m4/init.m4 (_AC_AM_CONFIG_HEADER_HOOK): Rewrite to be more
resistant to different quoting styles of $1.

16 years agoClarify texinfo.tex and TEXINFO_TEX semantics.
Ralf Wildenhues [Thu, 10 Jan 2008 19:49:07 +0000 (20:49 +0100)]
Clarify texinfo.tex and TEXINFO_TEX semantics.

* doc/automake.texi (Texinfo): Clarify that by default,
texinfo.tex is searched in the same directory as the Makefile.am
that needs it.  Clarify that TEXINFO_TEX has precedence over
AC_CONFIG_AUX_DIR, and that it requires the user to install and
distribute it.
* tests/txinfo22.test: Ensure TEXINFO_TEX is not distributed.
* THANKS: Update.
Reports by Dilyan Palauzov and Roumen Petrov.

16 years ago* tests/output-order.test: New test, for the stable output fix.
Ralf Wildenhues [Thu, 10 Jan 2008 19:50:02 +0000 (20:50 +0100)]
* tests/output-order.test: New test, for the stable output fix.
* tests/Makefile.am: Update.

16 years agoEnsure world-executable tests in the distribution.
Ralf Wildenhues [Tue, 8 Jan 2008 20:45:37 +0000 (21:45 +0100)]
Ensure world-executable tests in the distribution.

* Makefile.am (dist-hook): New, ensure world-executable tests.
* THANKS: Update.
Report by Arto C. Nirkko.

16 years agoFix acloca20.test for fast machines.
Ralf Wildenhues [Tue, 8 Jan 2008 20:37:21 +0000 (21:37 +0100)]
Fix acloca20.test for fast machines.

* tests/acloca20.test: Use `--force' with the second $AUTOCONF,
to force update on fast machines where both autoconf invocations
happen within the same second.
Report by Greg Schafer.

16 years agoStable `automake --add-missing --verbose' output.
Ralf Wildenhues [Mon, 7 Jan 2008 21:58:27 +0000 (22:58 +0100)]
Stable `automake --add-missing --verbose' output.

* automake.in (scan_autoconf_files): Sort loop over
%required_aux_file, for stable verbose output.
Report by Bruno Haible.

16 years ago* lib/config.guess, lib/config.sub, lib/texinfo.tex: Sync from upstream.
Ralf Wildenhues [Mon, 7 Jan 2008 21:31:01 +0000 (22:31 +0100)]
* lib/config.guess, lib/config.sub, lib/texinfo.tex: Sync from upstream.

16 years agoFix ccnoco.test for uncommon LDFLAGS settings.
Ralf Wildenhues [Mon, 7 Jan 2008 20:53:38 +0000 (21:53 +0100)]
Fix ccnoco.test for uncommon LDFLAGS settings.

* tests/ccnoco.test (Mycomp): Use a tighter match for -c -o,
to avoid matching for example `LDFLAGS=-Wl,--sort-common'.
* THANKS: Update.
Report and analysis by Carsten Lohrke and Mike Frysinger.

16 years ago* automake.in (handle_texinfo_helper, handle_lib_objects): Fix
Stepan Kasal [Mon, 7 Jan 2008 19:34:34 +0000 (20:34 +0100)]
* automake.in (handle_texinfo_helper, handle_lib_objects): Fix
typos in comments.

16 years agoRegenerate.
Ralf Wildenhues [Wed, 2 Jan 2008 19:14:28 +0000 (20:14 +0100)]
Regenerate.

16 years agoBump copyright years.
Ralf Wildenhues [Wed, 2 Jan 2008 18:59:08 +0000 (19:59 +0100)]
Bump copyright years.
* aclocal.in (write_aclocal, version): Likewise.
* automake.in ($gen_copyright, version): Likewise.
* doc/automake.texi: Likewise.

16 years ago* lib/gnupload (GPG): Don't use an absolute path.
Jim Meyering [Tue, 18 Dec 2007 16:49:49 +0000 (17:49 +0100)]
* lib/gnupload (GPG): Don't use an absolute path.

This reverts part of the 2004-01-28 change.
If the hypothetical cracker ever gets in to my (or any developer's)
system with sufficient privilege to modify the contents of
directories in my PATH (or change my PATH altogether), they can
already compromise my development work in so many ways that using
such absolute names in gnupload gives reduced functionality with
no added security.

16 years ago* lib/Automake/FileUtils.pm (open_quote): New function.
Ralf Wildenhues [Sat, 8 Dec 2007 10:23:38 +0000 (11:23 +0100)]
* lib/Automake/FileUtils.pm (open_quote): New function.
(update_file, contents): Use it.

16 years agoReword the copyright notices to match what's suggested in GPLv3.
Ralf Wildenhues [Sat, 8 Dec 2007 10:20:24 +0000 (11:20 +0100)]
Reword the copyright notices to match what's suggested in GPLv3.

16 years ago* tests/defs.in: Quote $srcdir, $PATH; skip libtool and gettext
Ralf Wildenhues [Sat, 8 Dec 2007 10:10:39 +0000 (11:10 +0100)]
* tests/defs.in: Quote $srcdir, $PATH; skip libtool and gettext
tests if the absolute source or build tree name contain whitespace.

16 years agoModify some tests for absolute trees containing whitespace.
Ralf Wildenhues [Sat, 8 Dec 2007 10:07:12 +0000 (11:07 +0100)]
Modify some tests for absolute trees containing whitespace.

* tests/missing.test: Use "./missing" instead of "`pwd`/missing".
* tests/missing2.test: Likewise.
* tests/mmodely.test: Add `pwd` to $PATH instead of absolute
references to myyacc.sh and mylex.sh.
* tests/multlib.test: Likewise for mycc.
* tests/txinfo26.test: Skip if `pwd` contains whitespace, as
an absolute --srcdir does not work there.

16 years ago* INSTALL, lib/INSTALL, lib/config-ml.in, lib/config.guess,
Ralf Wildenhues [Sat, 8 Dec 2007 10:03:12 +0000 (11:03 +0100)]
* INSTALL, lib/INSTALL, lib/config-ml.in, lib/config.guess,
lib/config.sub, lib/texinfo.tex: Sync from upstream.

16 years agoRegenerate.
Ralf Wildenhues [Sat, 8 Dec 2007 09:43:47 +0000 (10:43 +0100)]
Regenerate.