platform/upstream/automake.git
11 years agoMerge branch 'pkgconfing-tests-requirement' into maint
Stefano Lattarini [Fri, 14 Dec 2012 08:50:21 +0000 (09:50 +0100)]
Merge branch 'pkgconfing-tests-requirement' into maint

* pkgconfing-tests-requirement:
  tests: improve 'pkg-config' requirement

11 years agodocs: fixlet about xz compression levels and command line options
Patrick Welche [Fri, 14 Dec 2012 00:21:39 +0000 (00:21 +0000)]
docs: fixlet about xz compression levels and command line options

* doc/automake.texi (The types of distributions): To display a
progress bar, xz takes "-v" for verbose.

Copyright-paperwork-exempt: yes
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agomaint: more files excluded in 'update-copyright'
Stefano Lattarini [Thu, 13 Dec 2012 19:55:17 +0000 (20:55 +0100)]
maint: more files excluded in 'update-copyright'

This will avoid the following spurious warnings when
"make update-copyright" is run:

    .autom4te.cfg: warning: copyright statement not found
    .git-log-fix: warning: copyright statement not found
    .gitattributes: warning: copyright statement not found
    .gitignore: warning: copyright statement not found
    AUTHORS: warning: copyright statement not found
    THANKS: warning: copyright statement not found
    contrib/README: warning: copyright statement not found
    contrib/multilib/README: warning: copyright statement not found
    doc/amhello/README: warning: copyright statement not found
    lib/install-sh: warning: copyright statement not found
    lib/mkinstalldirs: warning: copyright statement not found
    m4/acdir/README: warning: copyright statement not found
    t/README: warning: copyright statement not found

* Makefile.am (files_without_copyright): New.
(update-copyright): Use it when computing '$exclude_list'.
Also, skip any README file.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agomaint: adapt 'update-copyright' recipe to the new $(FETCHFILES) format
Stefano Lattarini [Thu, 13 Dec 2012 19:46:09 +0000 (20:46 +0100)]
maint: adapt 'update-copyright' recipe to the new $(FETCHFILES) format

This is a fixup for commit v1.12.5-27-g71ce1b4 of 2012-12-09, "fetch:
improve, and reduce code duplication".

* Makefile.am (update-copyright): Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: improve 'pkg-config' requirement
Stefano Lattarini [Thu, 13 Dec 2012 08:46:18 +0000 (09:46 +0100)]
tests: improve 'pkg-config' requirement

This improves (and unifies among different tests) the detection of
both the 'pkg-config' program and m4 macros provided by it; they are
needed in particular by tests on Vala support.

Before this, some Vala-related tests were failing spuriously when the
pkg-config program was available but the macros from pkg.m4 were not
made explicitly available in ACLOCAL_PATH.  These tests were:

    vala-mix vala-mix2 vala-parallel vala-vapi vala-vpath

See also similar commit 'v1.11-581-gb7d67d5' of 2011-12-22,
"tests: better handling of gettext and libtool requirements".

* t/ax/am-test-lib.sh (process_requirements): If a requirement
matches the 'pkg-config*' wildcard, try to make available to it
the pkg-config m4 macros, and skip it if it's not possible.
This is done by sourcing the 'get.sh' fragment generated by ...
* t/pkg-config-macros.sh: ... this new test, which looks in
advance for the 'pkg-config' program and the m4 macros that
comes with it.
* t/list-of-tests.mk: Add the new test.
* gen-testsuite-part (%deps_extractor): Tests requiring pkg-config
will need the m4 macros coming with it; so these tests should be
run after the 'pkg-config-macros.sh' test.  Automatically generate
proper declarations for such dependencies.
* t/vala-header.sh: No need to explicitly check that the macro
PKG_CHECK_MODULES has been expanded by autoconf.
* t/vala-libs.sh: Likewise.
* t/vala-non-recursive-setup.sh: Likewise.
* t/vala-per-target-flags.sh: Likewise.
* t/vala-recursive-setup.sh: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agoMerge branch 'improve-release-process' into maint
Stefano Lattarini [Sun, 9 Dec 2012 20:54:57 +0000 (21:54 +0100)]
Merge branch 'improve-release-process' into maint

* improve-release-process:
  maintcheck: prefer '$(am__cd)' over plain 'cd'
  fetch: improve, and reduce code duplication
  docs: add rule to generate manuals for www.gnu.org
  docs: copy the 'gendocs.sh' script from Texinfo CVS repository
  sync: update files from upstream with "make fetch"
  release: generate a stub for the release announcement
  release: distinguish major and minor releases

11 years agodocs: AM_CFLAGS: remove reference to non-existing "more detailed" desc
Stefano Lattarini [Sun, 9 Dec 2012 19:00:15 +0000 (20:00 +0100)]
docs: AM_CFLAGS: remove reference to non-existing "more detailed" desc

* doc/automake.texi (Program variables): Here.  Reported by NightStrike:
<http://lists.gnu.org/archive/html/automake/2012-12/msg00012.html>

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agomaintcheck: prefer '$(am__cd)' over plain 'cd'
Stefano Lattarini [Sat, 8 Dec 2012 20:45:53 +0000 (21:45 +0100)]
maintcheck: prefer '$(am__cd)' over plain 'cd'

In a couple of rules in out own build system, as suggested by the
maintainer check 'sc_cd_relative_dir'.

* Makefile.am (web-manuals, clean_texinfo_clutter_cmd): Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agofetch: improve, and reduce code duplication
Stefano Lattarini [Sat, 8 Dec 2012 20:15:47 +0000 (21:15 +0100)]
fetch: improve, and reduce code duplication

* Makefile.am (WGET_SV_CVS, WGET_SV_GIT_CF, WGET_SV_GIT_AC,
WGET_SV_GIT_GL): Delete.
(SV_CVS, SV_GIT_CF, SV_GIT_AC, SV_GIT_GL): New.
(fetch): Simplify and enhance.
(update-copyright): Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agodocs: add rule to generate manuals for www.gnu.org
Stefano Lattarini [Sat, 8 Dec 2012 19:11:39 +0000 (20:11 +0100)]
docs: add rule to generate manuals for www.gnu.org

Less clerical work to do by hand.

* Makefile.am (web-manuals): New rule.
(clean_texinfo_clutter): New macro.
* clean-web-manuals, clean-texinfo-clutter: New cleaning
rules.
(clean-local): Depend on them.
* .gitignore: Update.
* HACKING: Adjust instructions for generation of manuals.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agodocs: copy the 'gendocs.sh' script from Texinfo CVS repository
Stefano Lattarini [Sat, 8 Dec 2012 18:49:33 +0000 (19:49 +0100)]
docs: copy the 'gendocs.sh' script from Texinfo CVS repository

As well as the 'gendocs_template' file.  And enhance the "make fetch"
target to keep them synced.  It's better than having to fetch these
files by hand each time a release is to be made.

* Makefile.am (FETCHFILES): List 'gendocs.sh' and 'gendocs_template'.
(fetch): Fetch them, into 'lib/'.
(EXRA_DIST): Distribute them.
* HACKING: Adjust instructions for generation of manuals.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agosync: update files from upstream with "make fetch"
Stefano Lattarini [Sat, 8 Dec 2012 18:33:23 +0000 (19:33 +0100)]
sync: update files from upstream with "make fetch"

* lib/config.sub: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agorelease: generate a stub for the release announcement
Stefano Lattarini [Sat, 8 Dec 2012 17:45:42 +0000 (18:45 +0100)]
release: generate a stub for the release announcement

It's much better than having to write it my hand each time; after all,
most of it is either boilerplate or a cope of NEWS entries.

* Makefile.am (determine_release_type): Also set the shell variable
'$announcement_type' appropriately.
(print-release-type): Print the value of this new variable as well.
(announcement): New phony target, generate a files with the same name.
The recipe uses the shell variable '$announcement_type'.
(CLEANFILES): Clean it.
(PACKAGE_MAILINGLIST): New make macro, used when generating the
'announcement' file.
* HACKING: Explain how to take advantage of the new convenience
target.
* .gitignore: Ignore the 'announcement' file.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agorelease: distinguish major and minor releases
Stefano Lattarini [Sat, 8 Dec 2012 16:26:58 +0000 (17:26 +0100)]
release: distinguish major and minor releases

This is mostly a preparatory change, in view of future
improvements in our release process.

* Makefile.am (determine_release_type): Also distinguish
between major and minor releases, with the help of ...
(stable_major_version_rx, stable_minor_version_rx): ... these
new macros.
(stable_version_rx): Remove, it's obsolete now.
(version_rx): Rename ...
(base_version_rx): ... like this, and adjust.
(print-release-type): New target; helps in debugging the code
that determines the release type.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: avoid two spurious failures on FreeBSD
Stefano Lattarini [Fri, 30 Nov 2012 14:33:15 +0000 (15:33 +0100)]
tests: avoid two spurious failures on FreeBSD

Due to the FreeBSD make bug that causes of the well-known automake
bug#7884, two of our bison-requiring tests were failing on FreeBSD.
To avoid this, simply skip the part of these tests affected by that
bug.

* t/yacc-bison-skeleton.sh: Here, using the 'yl_distcheck' function.
* t/yacc-bison-skeleton-cxx.sh: Likewise.
* t/yacc-nodist.sh: While at it, use the 'yl_distcheck' here
as well, instead of running "$MAKE distcheck" only when $MAKE
is GNU make.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agonews: we'll remove AM_PROG_MKDIR in 1.14, not 1.13
Stefano Lattarini [Mon, 26 Nov 2012 14:26:44 +0000 (15:26 +0100)]
news: we'll remove AM_PROG_MKDIR in 1.14, not 1.13

See also commit v1.12.4-158-gdf23daf.

* NEWS (Future backward-incompatibilities): Adjust accordingly.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: give few vala tests more significant names
Stefano Lattarini [Mon, 26 Nov 2012 14:15:11 +0000 (15:15 +0100)]
tests: give few vala tests more significant names

* t/vala.sh: Rename ...
* t/vala-grepping.sh: ... like this.
* t/vala2.sh: Rename ...
* t/vala-recursive-setup.sh: ... like this.
* t/vala3.sh: Rename ...
* t/vala-non-recursive-setup.sh: ... like this.
* t/vala4.sh: Rename ...
* t/vala-configure.sh: ... like this.
* t/vala5.sh: Rename ...
* t/vala-per-target-flags.sh: ... like this, and slightly
improve heading comments.
* t/list-of-tests.mk: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agovala tests: don't use the 'posix' profile, it's no longer supported
Stefano Lattarini [Mon, 26 Nov 2012 13:48:29 +0000 (14:48 +0100)]
vala tests: don't use the 'posix' profile, it's no longer supported

Fixes automake bug#12934 a.k.a. bug#12522.

Some of automake's Vala tests used to rely on "valac --profile posix"
(which makes it not use glib).  However, the posix profile was removed
in August 2012, and is no longer present in the GNOME 3.6.2 version
of valac (see commit ca020bf0 in the vala Git repository).

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* t/vala-libs.sh: Adjust to avoid using the posix profile.
* t/vala-mix.sh: Likewise.
* t/vala-mix2.sh: Likewise.
* t/vala-parallel.sh: Likewise.
* t/vala-vapi.sh: Likewise.
* t/vala-vpath.sh: Likewise.
* NEWS: Update and adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agonews: fixup: bug#8847 is fixed in 1.12.6, not in 1.12.5
Stefano Lattarini [Mon, 26 Nov 2012 12:33:45 +0000 (13:33 +0100)]
news: fixup: bug#8847 is fixed in 1.12.6, not in 1.12.5

* NEWS (Bugs fixed in 1.12.5): So move it from here ...
(Bugs fixed in 1.12.6): ... to here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agonews: document the fix for automake bug#10227
Stefano Lattarini [Mon, 26 Nov 2012 12:01:46 +0000 (13:01 +0100)]
news: document the fix for automake bug#10227

This is a follow-up commit for v1.12.5-14-g1f113f6.

* NEWS: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agoMerge branch 'python-fix-pr10227' into maint
Stefano Lattarini [Mon, 26 Nov 2012 11:51:16 +0000 (12:51 +0100)]
Merge branch 'python-fix-pr10227' into maint

* python-fix-pr10227:
  python: make installed modules find by default on Debian and Ubuntu

11 years agotests: fix a spurious testsuite failure on Solaris
Stefano Lattarini [Mon, 26 Nov 2012 11:22:51 +0000 (12:22 +0100)]
tests: fix a spurious testsuite failure on Solaris

Reported in automake bug#11524.

* t/amhello-binpkg.sh: When non-GNU tar is in use, relax grepping of
"tar cvf ..." output a little more.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agopython: make installed modules find by default on Debian and Ubuntu
Stefano Lattarini [Thu, 22 Nov 2012 11:03:07 +0000 (12:03 +0100)]
python: make installed modules find by default on Debian and Ubuntu

This change fixes automake bug#10227.

The code used to get the python package directory was wrong for Python 3,
at least on Debian and Ubuntu distributions.  In the case the installation
was using the default prefix "/usr/local", python modules were incorrectly
installed in the directory

    /usr/local/lib/python3/dist-packages

(which is *not* searched by default), rather than in a directory like

    /usr/local/lib/python3.x/dist-packages

which is searched by default.

* m4/python.m4 (AM_PATH_PYTHON): Try to use the 'sysconfig' module if
possible, for better interactions with python 3.x.

Helped-by: Reuben Thomas <rrt@sc3d.org>
Helped-by: Roumen Petrov <bugtrack@roumenpetrov.info>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: fix a spurious failure with older flex versions
Stefano Lattarini [Thu, 22 Nov 2012 09:29:37 +0000 (10:29 +0100)]
tests: fix a spurious failure with older flex versions

See automake bug#11524 and bug#12836.

* t/lex-header.sh: Here, we use flex option '--header-file',
but that option is not supported by some older flex versions.
Simply skip this test if such an old flex version is detected.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agoMerge branch 'python-pep-3147' into maint
Stefano Lattarini [Wed, 21 Nov 2012 09:28:41 +0000 (10:28 +0100)]
Merge branch 'python-pep-3147' into maint

* python-pep-3147:
  tests: fix a spurious failure when $PYTHON is in the environment
  python tests: support PEP-3147 installation layout
  python: uninstall cater to PEP-3147
  tests: improve a comment
  tests: honour $PYTHON override
  tests: typofix in message
  news: document fix for bug#8847 (PEP-3147, __pycache__)
  python: improve support for modern python (CPython 3.2 and PyPy)

11 years agotests: fix a spurious failure when $PYTHON is in the environment
Stefano Lattarini [Mon, 19 Nov 2012 21:56:22 +0000 (22:56 +0100)]
tests: fix a spurious failure when $PYTHON is in the environment

* t/python11.sh: This test doesn't interact well with user-overrides of
$PYTHON; and, given its particular nature, neither should it be expected
to honour that override.  Just unset that $PYTHON variable and live
happy.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agopython tests: support PEP-3147 installation layout
Stefano Lattarini [Mon, 19 Nov 2012 21:19:21 +0000 (22:19 +0100)]
python tests: support PEP-3147 installation layout

This fixes several spurious testsuite failures with python >= 3.2,
introduced by recent commit v1.12.4-43-ge0e99ed, "python: improve
support for modern python (CPython 3.2 and PyPy)".

* t/ax/am-test-lib.sh (python_has_pep3147, pyc_location, py_installed):
New functions.
($am_pep3147_tag): New variable.
* t/py-compile-basic2.sh: Deleted, too difficult to adapt for the
gain it would offer; move the still relevant parts ...
* t/py-compile-basic.sh: ... here.  Adapt and adjust the rest of
the test as well.
* t/nobase-python.sh: Adapt and adjust.
* t/py-compile-basedir.sh: Likewise.
* t/py-compile-destdir.sh: Likewise.
* t/py-compile-option-terminate.sh: Likewise.
* t/python-pr10995.sh: Likewise.
* t/python-virtualenv.sh: Likewise.
* t/python10.sh: Likewise.
* t/python12.sh: Likewise.
* t/python3.sh: Likewise.
* t/list-of-tests.mk: Adjust list of tests.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agopython: uninstall cater to PEP-3147
Stefano Lattarini [Mon, 19 Nov 2012 19:16:47 +0000 (20:16 +0100)]
python: uninstall cater to PEP-3147

After recent commit commit v1.12.4-43-ge0e99ed, "python: improve
support for modern python (CPython 3.2 and PyPy)", the python install
rules have been made smart enough to install "*.pyc" byte-compiled
files according to PEP-3147 with modern (post-3.2) pythons.  However,
the uninstall rules hadn't been updated accordingly, causing leftover
files to remain around after "make uninstall", as well as failures in
"make distcheck".

* lib/am/python.am (am__pep3147_tweak): New internal macro, used
in ...
(uninstall-%DIR%PYTHON): ... the recipe of this target, which has
been adjusted to cater to PEP-3147

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agobuild: fix rebuild rules for Makefile.in and aclocal.m4
Stefano Lattarini [Sat, 17 Nov 2012 18:57:02 +0000 (19:57 +0100)]
build: fix rebuild rules for Makefile.in and aclocal.m4

They have been broken after our removal of the 'perllibdir' hack
in yesterday's commit v1.12.4-45-g4872dfe.

* configure.ac: Rather then redefining AUTOMAKE and ACLOCAL to
explicitly override the perllibdir, the acdir and the libdir, use
the ready-made t/wrap/{aclocal,automake}-$APIVERSION scripts.
* NEWS: Document the fix.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agohacking: release procedure: fix order of some steps
Stefano Lattarini [Sat, 17 Nov 2012 18:42:58 +0000 (19:42 +0100)]
hacking: release procedure: fix order of some steps

* HACKING (Release procedure): The manuals should be rebuilt and
uploaded at at www.gnu.org *before* bumping the version number to
the next alpha release.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agomaint: post-release minor version bump
Stefano Lattarini [Sat, 17 Nov 2012 18:30:03 +0000 (19:30 +0100)]
maint: post-release minor version bump

* configure.ac (AC_INIT): Bump version number to 1.12.5a.
* m4/amversion.m4: Likewise (automatically regenerated by
"make bootstrap").

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agorelease: stable release 1.12.5 v1.12.5
Stefano Lattarini [Sat, 17 Nov 2012 15:43:39 +0000 (16:43 +0100)]
release: stable release 1.12.5

* configure.ac (AC_INIT): Bump version number to 1.12.5.
* m4/amversion.m4: Likewise (auto-updated by "make bootstrap").

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agomaintcheck: avoid failures, sync with 'ng/master' more
Stefano Lattarini [Fri, 16 Nov 2012 13:17:01 +0000 (14:17 +0100)]
maintcheck: avoid failures, sync with 'ng/master' more

* syntax-checks.mk (sc_diff_aclocal_in_aclocal,
sc_diff_automake_in_automake): Rename ...
(sc_diff_aclocal, sc_diff_automake): ... respectively to these, rewrite
to use static pattern rules and 'diff -u' instead of bare 'diff'.  This
makes the rules more robust in the face of edits to 'automake.in' and
'aclocal.in', and get them in sync with the corresponding checks in the
'ng/master' branch.
(syntax_check_rules): Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agomaintcheck: remove 'sc_perl_syntax'
Stefano Lattarini [Fri, 16 Nov 2012 13:07:40 +0000 (14:07 +0100)]
maintcheck: remove 'sc_perl_syntax'

It is quite useless, since a "make bootstrap" or "make check" would
immediately catch a breakage in the 'aclocal' or 'automake' scripts
anyway.  In addition, the recent removal of the 'perllibdir' environment
variable hack has broken this check.

* syntax-checks.mk (sc_perl_syntax): Remove.
(syntax_check_rules): No longer list it.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agosync: update files from upstream with "make fetch"
Stefano Lattarini [Fri, 16 Nov 2012 12:03:14 +0000 (13:03 +0100)]
sync: update files from upstream with "make fetch"

* lib/texinfo.tex, lib/config.sub: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agomaint: get rid of $perllibdir environment variable hack
Stefano Lattarini [Fri, 16 Nov 2012 11:45:59 +0000 (12:45 +0100)]
maint: get rid of $perllibdir environment variable hack

That was needed when the automake-$APIVERSION and aclocal-$APIVERSION
wrapper scripts used by the testsuite were shell script, rather than
perl scripts acting as a thin layers.

* aclocal.in (BEGIN): Update @INC based on the contents of the array
'@Aclocal::perl_libdirs', rather than of the environment variable
'perllibdir'.
* t/wrap/aclocal.in (BEGIN): Initialize '@Aclocal::perl_libdirs'
rather than $ENV{'perllibdir'}.
* automake.in (BEGIN): Update @INC based on the contents of the array
'@Automake::perl_libdirs', rather than of the environment variable
'perllibdir'.
* t/wrap/automake.in (BEGIN): Initialize '@Automake::perl_libdirs'
rather than $ENV{'perllibdir'}.
* NEWS: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agoconfigure: respect the '-q' option better
Stefano Lattarini [Fri, 16 Nov 2012 11:07:52 +0000 (12:07 +0100)]
configure: respect the '-q' option better

* configure.ac: Here, by avoiding to print the warnings about
using a non-stable Automake version if the '$silent' variable
is set to "yes".

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agocosmetics: de-tabify configure.ac
Stefano Lattarini [Fri, 16 Nov 2012 10:44:18 +0000 (11:44 +0100)]
cosmetics: de-tabify configure.ac

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: improve a comment
Stefano Lattarini [Sun, 11 Nov 2012 11:39:40 +0000 (12:39 +0100)]
tests: improve a comment

* t/ax/am-test-lib.sh (require_tool): Here, about python support
for '--version' option.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: honour $PYTHON override
Stefano Lattarini [Sun, 11 Nov 2012 11:03:46 +0000 (12:03 +0100)]
tests: honour $PYTHON override

* t/ax/am-test-lib.sh (require_tool): Here.
* t/python-too-old.sh: And here.
* t/python-vars.sh: And here.
* t/python-virtualenv.sh: And here.  Also add some sanity
checks while at it.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: typofix in message
Stefano Lattarini [Sun, 11 Nov 2012 10:55:43 +0000 (11:55 +0100)]
tests: typofix in message

* t/python-virtualenv.sh: Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agonews: document fix for bug#8847 (PEP-3147, __pycache__)
Stefano Lattarini [Sun, 11 Nov 2012 10:43:06 +0000 (11:43 +0100)]
news: document fix for bug#8847 (PEP-3147, __pycache__)

* NEWS (Bugs fixed in 1.12.5): Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agopython: improve support for modern python (CPython 3.2 and PyPy)
Yaakov Selkowitz [Mon, 5 Nov 2012 17:45:15 +0000 (11:45 -0600)]
python: improve support for modern python (CPython 3.2 and PyPy)

This fixes automake bug#8847.

* m4/python.m4 (AM_PATH_PYTHON): Add python3.3 to
_AM_PYTHON_INTERPRETER_LIST.
* lib/py-compile: Fix compiled filenames for PEP-3147, currently
implemented in CPython 3.2 and newer.  Do not create '.pyo' files
for PyPy.

Copyright-paperwork-exempt: yes
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: new variable $am_testaux_builddir
Stefano Lattarini [Wed, 7 Nov 2012 16:59:40 +0000 (17:59 +0100)]
tests: new variable $am_testaux_builddir

And a related fix that solves a spurious testsuite failures in
VPATH builds.

* t/ax/test-defs.in ($am_testaux_builddir): New, counterpart of
$am_testaux_srcdir, but pointing inside the build directory.
* t/self-check-shell-no-trail-bslash.sh: Use $am_testaux_builddir,
not $am_testaux_srcdir, when fetching the 'shell-no-trail-bslash'
script.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: rename $am_testauxdir -> $am_testaux_srcdir
Stefano Lattarini [Wed, 7 Nov 2012 16:52:25 +0000 (17:52 +0100)]
tests: rename $am_testauxdir -> $am_testaux_srcdir

This is just a preparatory change in view of a future commit.

* t/ax/test-defs.in: Here.
* t/ax/tap-summary-aux.sh: And here.
* t/ax/testsuite-summary-checks.sh: And here.
* t/distcheck-missing-m4.sh: And here.
* t/distcheck-outdated-m4.sh: And here.
* t/self-check-shell-no-trail-bslash.sh: And here.
* t/test-driver-acsubst.sh: And here.
* t/test-driver-cond.sh: And here.
* t/test-driver-custom-multitest.sh: And here.
* t/test-driver-custom-multitest-recheck.sh: And here.
* t/test-driver-custom-multitest-recheck2.sh: And here.
* t/testsuite-summary-count-many.sh: And here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agovala tests: source test-init.sh, not ./defs
Stefano Lattarini [Wed, 31 Oct 2012 11:40:47 +0000 (12:40 +0100)]
vala tests: source test-init.sh, not ./defs

This will avoid spurious errors when the new vala tests (introduced
in the 'vala-work' branch) will be merged back to master.

* t/vala-headers.sh: Adjust as said.
* t/vala-libs.sh: Likewise.
* t/vala-mix.sh: Likewise.
* t/vala-mix2.sh: Likewise.
* t/vala-parallel.sh: Likewise.
* t/vala-vapi.sh: Likewise.
* t/vala-vpath.sh: Likewise.
* t/vala.sh: Likewise.
* t/vala2.sh: Likewise.
* t/vala3.sh: Likewise.
* t/vala4.sh: Likewise.
* t/vala5.sh: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: fix a spurious typo-related failure
Stefano Lattarini [Wed, 31 Oct 2012 11:37:51 +0000 (12:37 +0100)]
tests: fix a spurious typo-related failure

* t/self-check-shell-no-trail-bslash.sh: Here, due to a mistaken
use of "||" instead of "&&".

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agoMerge branch 'vala-work' into maint
Stefano Lattarini [Wed, 31 Oct 2012 10:44:18 +0000 (11:44 +0100)]
Merge branch 'vala-work' into maint

* vala-work:
  vala: improve comments to AM_PROG_VALAC
  news: update w.r.t. recent vala changes
  vala: if no proper compiler found, set $(VALAC) to 'valac'
  vala: AM_PROG_VALAC should not produce an error for tool-old valac
  docs: document recent changes to AM_PROG_VALAC
  tests: enhance tests on AM_PROG_VALAC
  vala: style fixes in vala.m4
  vala: add action arguments, for when no proper vala compiler is found

11 years agotests: remove spurious leftover use of 'Exit'
Stefano Lattarini [Wed, 31 Oct 2012 10:41:31 +0000 (11:41 +0100)]
tests: remove spurious leftover use of 'Exit'

Issue revealed by the 'sc_tests_Exit_not_exit' maintainer check.

Commit 'v1.12.4-184-g9fed1c8' in master made the same fix basically,
but we mistakenly applied it to master only, rather than to maint.

* t/per-target-flags.sh: Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: can check our recipes avoid trailing backslashes
Stefano Lattarini [Sun, 28 Oct 2012 13:02:46 +0000 (14:02 +0100)]
tests: can check our recipes avoid trailing backslashes

This is related to commit v1.11-1704-g254227b of 2012-05-01,
"parallel-tests: avoid trailing backslashes in make recipes",
and automake bug#10436.

Recipes with a trailing backslash character (possibly followed by
blank characters only) can cause spurious syntax errors with at
least older bash versions (e.g., bash 2.05b), and can be potentially
be unportable to other weaker shells.

So provide a target that runs the testsuite looking for this kind
of breakage (without requiring a real bugged shell).

* t/ax/shell-no-trail-bslash.in: New, a "shell" that chokes on '-c'
commands having a trailing '\' (possibly followed by whitespace only).
* Makefile (t/ax/shell-no-trail-bslash): Generate this script from it.
(noinst_SCRIPTS, CLEANFILES): Add it.
(EXTRA_DIST): Add 't/ax/shell-no-trail-bslash.in'.
(check-no-trailing-backslash-in-recipes): New target, runs the testsuite
with 'shell-no-trail-bslash' as the CONFIG_SHELL, to catch possible
recipes having a trailing backslash character (possibly followed by
* .gitignore: Update.
* t/self-check-shell-no-trail-bslash.sh: New testsuite self-check.
* t/parallel-tests-trailing-bslash.sh: Remove as obsolete.
* t/list-of-tests.mk: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agoconfigure: correctly identify missing GNU compilers as such
Stefano Lattarini [Sat, 27 Oct 2012 17:10:20 +0000 (19:10 +0200)]
configure: correctly identify missing GNU compilers as such

* configure.ac: Here, instead of mistakenly diagnose them as "botched".

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: merge, tweak and modernize few test scripts
Stefano Lattarini [Sat, 9 Jun 2012 18:49:09 +0000 (20:49 +0200)]
tests: merge, tweak and modernize few test scripts

Basically an adjusted-and-improved cherry-pick from Automake-NG
commit v1.12.1-343-gff30f83.

* t/specflg.sh, t/specflg2.sh, t/specflg3.sh: Merged into ...
* t/per-target-flags.sh: ... this test.
* t/fo.sh: Remove, its weak grepping checks well superseded by
the semantic checks in 't/fort4.sh'.
* t/cxxo.sh: Remove, its weak grepping checks well superseded
by the semantic checks in 't/cxx-demo.sh'.
* t/cxxcpp.sh: Enhance a little.
* t/empty.sh: Renamed ...
* t/empty-data-primary.sh: ... to this.  Add trailing ':' command.
* t/empty2.sh, t/empty3.sh, t/empty4.sh: Merged ...
* t/empty-sources-primary.tap: ... into this new test.
* t/no-outdir-option.sh: Remove.  A test to check than an obsolete
and now deleted option ("--output-dir") stays deleted is way too
much even for the most test-infected person ;-)
* t/list-of-tests.mk: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: move coverage about BUILT_SOURCES
Stefano Lattarini [Sat, 27 Oct 2012 13:38:46 +0000 (15:38 +0200)]
tests: move coverage about BUILT_SOURCES

Basically a backport of some tests from Automake-NG.

* t/built-sources-check.sh: Sync it with the version in the ng/master
branch.  Accordingly, move part of the checks out ...
* t/built-sources-install.sh: ... into this new test, synced from
ng/master as well.
* t/built-sources-subdir.sh: Minor tweaks and enhancements to sync it
with the version in ng/master.
* t/built-sources-cond.sh: New test, synced from ng/master.
* t/built-sources.sh: Likewise, with minor edits to avoid a spurious
failure.
* t/built-sources-fork-bomb.sh: Likewise.
* t/list-of-tests.mk: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: more meaningful names for some test cases
Stefano Lattarini [Sat, 27 Oct 2012 13:26:50 +0000 (15:26 +0200)]
tests: more meaningful names for some test cases

* t/yacc5.sh: Renamed ...
* t/yacc-grepping2.sh: ... like this.
* t/yacc7.sh: Renamed ...
* t/yacc-headers-and-pr47.sh: ... like this.
* t/yacc8.sh: Renamed ...
* t/yacc-subdir.sh: ... like this.
* t/subdir10.sh: Rename ...
* t/subdir-env-interference.sh: ... like this.
* t/specflg10.sh: Rename ...
* t/am-default-source-ext.sh: ... like this.
* t/suffix12.sh: Rename ...
* t/suffix-custom-subobj.sh: ... like this.
* t/suffix13.sh: Rename ...
* t/suffix-custom-subobj-and-specflg.sh: ... like this.
* t/check3.sh: Rename ...
* t/built-sources-check.sh: ... like this.
* t/subdirbuiltsources.sh: Rename ...
* t/built-sources-subdir.sh: ... like this.
* t/bsource.sh: Rename ...
* t/no-spurious-install-recursive.sh: ... like this.
* t/list-of-tests.mk: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: merge some grepping tests on Yacc support
Stefano Lattarini [Sat, 27 Oct 2012 12:45:51 +0000 (14:45 +0200)]
tests: merge some grepping tests on Yacc support

* t/yacc.sh, t/yacc2.sh: Merge ...
* t/yacc-grepping.sh: ... into this test.
* t/list-of-tests.mk: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: prepare to move ./defs to t/ax/test-init.sh
Stefano Lattarini [Sat, 27 Oct 2012 10:59:41 +0000 (12:59 +0200)]
tests: prepare to move ./defs to t/ax/test-init.sh

We don't do this in a sweeping passage, because that would cause
endless headaches in the synchronization between the maint, master
and ng/master branches.  Instead, we setup our framework to allow
test scripts to work by sourcing either './defs' or 'test-init.sh',
so that we'll be able to make the transition gradual and painless.

* t/ax/test-init.sh: New, copied from the previous ./defs file.
* defs: Simply work by sourcing the new file.
* Makefile.am (dist_noinst_DATA): List the new file.
* t/README: Adjust to mandate the sourcing of 'test-init.sh' rather
than of './defs'.
* t/c-demo.sh: Source 'test-init.sh' instead of ./defs.  This is
done to verify our new setup actually works.
* t/ac-output-old.tap: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agodepcomp: avoid potential interferences from the environment
Stefano Lattarini [Sat, 27 Oct 2012 09:19:22 +0000 (11:19 +0200)]
depcomp: avoid potential interferences from the environment

* lib/depcomp (gccflag, dashmflag): By explicitly initializing these
variables to the empty string by default.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agodepcomp: improve comments about the 'gcc' depmode
Stefano Lattarini [Sat, 27 Oct 2012 09:12:59 +0000 (11:12 +0200)]
depcomp: improve comments about the 'gcc' depmode

It is not only needed by obsolescent gcc compilers (pre-3.x),
but also by modern compiler like IBM C/C++.  State that ...

* lib/depcomp: ... here...
* gen-testsuite-part: ... and here, where we generate the
'depcomp*.tap' tests.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agovala: improve comments to AM_PROG_VALAC
Stefano Lattarini [Fri, 26 Oct 2012 18:22:40 +0000 (20:22 +0200)]
vala: improve comments to AM_PROG_VALAC

* m4/vala.m4 (AM_PROG_VALAC): Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agonews: update w.r.t. recent vala changes
Stefano Lattarini [Fri, 26 Oct 2012 18:18:51 +0000 (20:18 +0200)]
news: update w.r.t. recent vala changes

* NEWS: Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agovala: if no proper compiler found, set $(VALAC) to 'valac'
Stefano Lattarini [Fri, 26 Oct 2012 16:01:17 +0000 (18:01 +0200)]
vala: if no proper compiler found, set $(VALAC) to 'valac'

This is better than setting it to ':' (as is currently done), because
a triggered makefile rule invoking a vala compilation will then clearly
fail with an informative error message like "valac: command not found",
rather than silently, with the error possibly going unnoticed, or
triggering harder-to-diagnose fallout failures in later steps.

For a precedent of a similar behaviour, see the AC_PROG_YACC macro.

* m4/valac.m4: Implement the new semantic.
* doc/automake.texi (Vala Support): Document it.
* t/vala4.sh: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agovala: AM_PROG_VALAC should not produce an error for tool-old valac
Sébastien Wilmet [Fri, 26 Oct 2012 15:08:09 +0000 (17:08 +0200)]
vala: AM_PROG_VALAC should not produce an error for tool-old valac

This change fixes automake bug#12688.

In the AM_PROG_VALAC macro, when the optional parameter specifying the
minimum release number is not provided, and/or if the Vala compiler is
not found, then there is a _warning_ message.

On the other hand, when the version number is specified and if the Vala
compiler is too old, there is an _error_ message.

This error message is problematic, because for a tarball, the Vala
compiler is not required: the generated C code is included in the
tarball.  So if a user wants to compile the software, he shouldn't
need the valac program with the right version.

* m4/vala.m4 (AM_PROG_VALAC): Modify to use AC_MSG_WARN instead
of AC_MSG_ERROR.
* t/vala4.sh: Adjust and enhance.
* doc/automake.texi (Vala Support): Likewise.
* THANKS: Update.

Co-authored-by: Matthieu Baerts <matttbe@glx-dock.org>
Co-authored-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Copyright-paperwork-exempt: yes
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agodocs: document recent changes to AM_PROG_VALAC
Stefano Lattarini [Fri, 26 Oct 2012 14:50:26 +0000 (16:50 +0200)]
docs: document recent changes to AM_PROG_VALAC

* doc/automake.texi (Vala Support): Here.  This is a follow-up to
recent commit 'v1.12.4-20-gdf202a3', "vala: add action arguments,
for when no proper vala compiler is found".

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: enhance tests on AM_PROG_VALAC
Stefano Lattarini [Fri, 26 Oct 2012 13:51:53 +0000 (15:51 +0200)]
tests: enhance tests on AM_PROG_VALAC

* t/vala4.sh: Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agovala: style fixes in vala.m4
Stefano Lattarini [Fri, 26 Oct 2012 13:18:44 +0000 (15:18 +0200)]
vala: style fixes in vala.m4

* m4/vala.m4 (AM_PROG_VALAC): Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agovala: add action arguments, for when no proper vala compiler is found
Daiki Ueno [Tue, 11 Sep 2012 08:55:37 +0000 (17:55 +0900)]
vala: add action arguments, for when no proper vala compiler is found

* m4/vala.m4 (AM_PROG_VALAC): Add optional action arguments to
control the behavior if specified version of valac is not found.
This emulates the behaviour of AM_PATH_PYTHON.
* t/vala4.sh: Enhance.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Copyright-paperwork-exempt: yes

11 years agosync: update files from upstream with "make fetch"
Stefano Lattarini [Fri, 26 Oct 2012 13:05:53 +0000 (15:05 +0200)]
sync: update files from upstream with "make fetch"

* lib/config.guess, lib/config.sub: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agomaintcheck: remove an obsolescent check
Stefano Lattarini [Fri, 26 Oct 2012 13:00:39 +0000 (15:00 +0200)]
maintcheck: remove an obsolescent check

* syntax-checks.mk (sc_test_names): Remove this check, which verified
that no test name contained an m4/m4sugar builtin or macro name.  Since
most tests use their own name as the first argument to AC_INIT, doing
that would have tickled a bug in Autoconf 2.62; but the bug was fixed
in Autoconf 2.63 already; and we are going to soon require Autoconf
2.65 anyway (in automake 1.13), so this check has become more annoying
than useful.
(syntax_check_rules): Don't list the removed check.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: rename some tests to more expressive names, again
Stefano Lattarini [Fri, 26 Oct 2012 12:50:46 +0000 (14:50 +0200)]
tests: rename some tests to more expressive names, again

* t/parallel-tests.sh: Rename ...
* t/parallel-tests-basics.sh: ... like this.
* t/parallel-tests3.sh: Rename ...
* t/parallel-tests-concurrency.sh: ... like this.
* t/parallel-tests5.sh: Rename ...
* t/parallel-tests-concurrency-2.sh: ... like this.
* t/parallel-tests6.sh: Rename ...
* t/parallel-tests-empty.sh: ... like this.  Adjust comments.
* t/parallel-tests8.sh: Rename ...
* t/parallel-tests-generated-and-distributed.sh: ... like this.
* t/parallel-tests9.sh: Rename ...
* t/parallel-tests-recheck.sh: ... like this.
* t/parallel-tests10.sh: Rename ...
* t/parallel-tests-trailing-whitespace.sh: ... like this.
* t/remake3a.sh: Rename ...
* t/remake-subdir-no-makefile.sh: ... like this.
* t/remake4.sh: Rename ...
* t/remake-not-after-make-dist.sh: ... like this.
* t/remake5.sh: Rename ...
* t/remake-maintainer-mode.sh: ... like this.
* t/remake6.sh: Rename ...
* t/remake-subdir3.sh: ... like this.
* t/remake7.sh: Rename ...
* t/remake-fail.sh: ... like this.
* t/remake11.sh: Rename ...
* t/remake-deeply-nested.sh: ... like this
* t/remake12.sh: Rename ...
* t/remake-mild-stress.sh: ... like this
* t/pr8365-remake-timing.sh: Rename ...
* t/remake-timing-bug-pr8365.sh: ... like this.
* t/list-of-tests.mk: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: remove an obsolescent grepping check
Stefano Lattarini [Fri, 26 Oct 2012 12:16:05 +0000 (14:16 +0200)]
tests: remove an obsolescent grepping check

* t/remake3.sh: This one, superseded by ...
* t/remake3a.sh: ... this semantic test, whose comments have been
djusted accordingly.
* t/list-of-tests.mk: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: merge two tests on automatic remake functionality
Stefano Lattarini [Fri, 26 Oct 2012 12:13:25 +0000 (14:13 +0200)]
tests: merge two tests on automatic remake functionality

* t/remake2.sh: Merge ...
* t/remake-subdir-grepping.sh: ... in here.
* t/list-of-tests.mk: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: rename some test to more expressive names
Stefano Lattarini [Fri, 26 Oct 2012 10:52:35 +0000 (12:52 +0200)]
tests: rename some test to more expressive names

* t/remake.sh: Rename ...
* t/remake-subdir-grepping.sh: ... like this.
* t/remake8a.sh: Rename ...
* t/remake-makefile-intree.sh: ... like this, and adjust comments.
* t/remake8b.sh: Rename ...
* t/remake-makefile-vpath.sh: ... like this, and adjust comments.
* t/remake9a.sh: Rename ...
* t/remake-after-configure-ac.sh: ... like this, and adjust comments.
* t/remake9b.sh: Rename ...
* t/remake-after-makefile-am.sh: ... like this, and adjust comments.
* t/remake9c.sh: Rename ...
* t/remake-after-acinclude-m4.sh: ... like this, and adjust comments.
* t/remake9d.sh: Rename ...
* t/remake-after-aclocal-m4.sh: ... like this, and adjust comments.
* t/remake10a.sh: Rename ...
* t/remake-include-configure.sh: ... like this, and adjust comments.
* t/remake10b.sh: Rename ...
* t/remake-include-makefile.sh: ... like this, and adjust comments.
* t/remake10c.sh: Rename ...
* t/remake-include-aclocal.sh: ... like this, and adjust comments.
* t/list-of-tests.mk: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agonews: 'compile' supports libfoo.a naming when wrapping Microsoft tools
Stefano Lattarini [Fri, 26 Oct 2012 10:40:43 +0000 (12:40 +0200)]
news: 'compile' supports libfoo.a naming when wrapping Microsoft tools

This is a follow-up to commit 'v1.12.4-10-g3c5c939' of 2012-10-04,
"compile: support libfoo.a naming when wrapping Microsoft tools".

* NEWS (Bugs fixed in 1.12.5): Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: ensure generation of wrapper tests matching multiple conditions
Stefano Lattarini [Fri, 26 Oct 2012 09:36:12 +0000 (11:36 +0200)]
tests: ensure generation of wrapper tests matching multiple conditions

* gen-testsuite-part: Our old code to generate wrapper tests had a
severe limitation, in that if a test matched two or more conditions
calling for generation of wrapper tests, still only one wrapper test
was generated, instead of the three that would have been expected --
that is, one using the setup code triggered by the first condition,
one using the setup code triggered by the second condition, and one
using both this setup code fragments.
Admittedly, this was only a theoretical limitation for the moment,
since since so far no test exists that matches two or more conditions
for wrapping.  Still, this might change in the future, and easily in
an unnoticed way, so better fix the issue now, before it might become
a real problem.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: simplify a loop in gen-testsuite-part
Stefano Lattarini [Fri, 26 Oct 2012 09:04:14 +0000 (11:04 +0200)]
tests: simplify a loop in gen-testsuite-part

* gen-testsuite-part: No need to loop on the (key, value) entries
of the %test_generators has: we only use the value, and never the
key.  So loop simply on the values.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agocompile: support libfoo.a naming when wrapping Microsoft tools
Peter Rosin [Wed, 3 Oct 2012 22:08:26 +0000 (00:08 +0200)]
compile: support libfoo.a naming when wrapping Microsoft tools

There is a future plan to provide some means to have Automake
create static libraries that are named differently depending
on the system [1].

The background is that everyone has always named static libraries
libfoo.a, except the Redmond crowd who names them foo.lib, and
you have to jump through hoops to have Automake create libraries
named foo.lib in the land of non-GNU Windows while still creating
libfoo.a everywhere else.

However, there is probably no sane way to accomplish that system
dependent naming discussed in [1] without user intervention,
which makes it necessary to support the classic libfoo.a naming
when using Microsoft tools in the best possible way, for the
benefit of all projects today and for future projects not
opting in to whatever scheme is selected for the problem at
hand.

[1] http://lists.gnu.org/archive/html/automake/2012-09/msg00028.html

* lib/compile (func_cl_dashl): As a last resort, match -lfoo with
libfoo.a, if that file exist on the library search path.
* t/compile4.sh: Remove obsolescent workaround for the above.
* t/compile6.sh: Extend to check that libbaz.a is indeed found
when baz.lib and baz.dll.lib does not exist and that bar.lib
and bar.dll.lib are preferred over libbar.a.

Signed-off-by: Peter Rosin <peda@lysator.liu.se>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agoNEWS: fix wording and grammaros, re-wrap text accordingly
Stefano Lattarini [Sun, 14 Oct 2012 09:54:45 +0000 (11:54 +0200)]
NEWS: fix wording and grammaros, re-wrap text accordingly

Reported-by: Peter Rosin <peda@lysator.liu.se>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agocosmetics: fix typo in 'lib/depcomp' comments
Paul Eggert [Sun, 14 Oct 2012 09:43:26 +0000 (11:43 +0200)]
cosmetics: fix typo in 'lib/depcomp' comments

Fixes automake bug#12578.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agoconfig headers: remove stale comment in makefile fragment
Stefano Lattarini [Tue, 2 Oct 2012 14:45:37 +0000 (16:45 +0200)]
config headers: remove stale comment in makefile fragment

* lib/am/remake-hdr.am: Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agoNEWS: wording and quoting fixlets in few older entries
Stefano Lattarini [Tue, 2 Oct 2012 14:11:49 +0000 (16:11 +0200)]
NEWS: wording and quoting fixlets in few older entries

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agoconfig headers: don't emit rules for headers not generated by autoheader
Stefano Lattarini [Fri, 28 Sep 2012 19:27:41 +0000 (21:27 +0200)]
config headers: don't emit rules for headers not generated by autoheader

This change fixed automake bug#12495.

Even if an AC_CONFIG_HEADERS invocation is passed a list of several files
as the first argument, only the first one of those file is considered by
autoheader for automatic generation of the corresponding '.in' template.
This is done on purpose, and is clearly documented in the Autoconf manual,
which (as of the 2.69 version) reads something like this:

    The autoheader program searches for the first invocation of
    AC_CONFIG_HEADERS in configure sources to determine the name of
    the template.  If the first call of AC_CONFIG_HEADERS specifies
    more than one input file name, autoheader uses the first one.

That is, an invocation like:

    AC_CONFIG_HEADERS([config.h config2.h])

should cause autoheader to generate only a 'config.h.in' template,
and not also a 'config2.h.in' one.

Accordingly, automake, when tracing AC_CONFIG_HEADERS, should generate
remake rules only for the template associated to the first input file
name passed to that macro.  In some situations, however, automake failed
to properly limit itself in this way; for example, with an input like:

    AC_CONFIG_HEADERS([config.h sub/foo.h])

in configure.ac, and with the 'sub' directory listed in the SUBDIRS
variable of the top-level Makefile, automake would erroneously generate
in 'sub/Makefile.in' a rule to remake the 'foo.h.in' template by
invoking autoheader.

This issue was likely introduced in commit 'Release-1-8-23-g262bb92'
of 2004-01-05.

* NEWS: Update.
* doc/automake.texi (Optional): Improve wording in the description of
hat rules automake generates in response to an 'AC_CONFIG_HEADERS'
invocation.
* lib/am/remake-hdr.am: Only emit autoheader-invoking remake rules for
the %CONFIG_HIN% template if that corresponds to the first argument of
AC_CONFIG_HEADERS, as explaned above.  Do so using the automake-time
conditional %?FIRST-HDR%, that is properly passed ...
* automake.in (handle_configure): ... from a 'file_contents' invocation
in here.
* t/autohdr-subdir-pr12495.sh: New test.
* t/list-of-tests.mk: Add it.
* THANKS: Update.

Helped-by: Hib Eris <hib@hiberis.nl>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agodocs: fix minor typo: s/expending/expanding/
Stefano Lattarini [Thu, 27 Sep 2012 07:43:27 +0000 (09:43 +0200)]
docs: fix minor typo: s/expending/expanding/

* doc/automake.texi (Wildcards): Here.  Fixes automake bug#12516.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agosync: update files from upstream with "make fetch"
Stefano Lattarini [Tue, 18 Sep 2012 11:57:51 +0000 (13:57 +0200)]
sync: update files from upstream with "make fetch"

* lib/texinfo.tex: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agomaint: post-release minor version bump
Stefano Lattarini [Tue, 18 Sep 2012 11:55:55 +0000 (13:55 +0200)]
maint: post-release minor version bump

* configure.ac (AC_INIT): Bump version number to 1.12.4a.
* m4/amversion.m4: Likewise (automatically regenerated by
"make bootstrap").

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agomaint: typo fixes s/lies into/lies in/
Jim Meyering [Sun, 23 Sep 2012 16:22:30 +0000 (18:22 +0200)]
maint: typo fixes s/lies into/lies in/

11 years agorelease: stable release 1.12.4 v1.12.4
Stefano Lattarini [Mon, 17 Sep 2012 18:14:07 +0000 (20:14 +0200)]
release: stable release 1.12.4

* configure.ac (AC_INIT): Bump version number to 1.12.4.
* m4/amversion.m4: Likewise (auto-updated by "make bootstrap").

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agoNEWS: minor fix
Stefano Lattarini [Mon, 17 Sep 2012 18:31:53 +0000 (20:31 +0200)]
NEWS: minor fix

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agocoverage: better exposure for automake bug#12372 (tags-related)
Stefano Lattarini [Tue, 11 Sep 2012 09:15:41 +0000 (11:15 +0200)]
coverage: better exposure for automake bug#12372 (tags-related)

Alas, in contrast with what is said in the commit message of previous
commit 'v1.12.3-14-g94b7b8e', that bug is still present also in the
current maint branch (which will become automake version 1.12.4); it
is just that it only triggers when a _SOURCES variable contains only
files with custom extension.

* t/tags-pr12372.sh: Extend.
* t/list-of-tests.mk: Add it.

Suggested-by: Юрий Пухальский <aikipooh@gmail.com>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agocoverage: expose automake bug#12372 (tags-related)
Stefano Lattarini [Fri, 7 Sep 2012 08:42:42 +0000 (10:42 +0200)]
coverage: expose automake bug#12372 (tags-related)

That bug is somehow already been fixed in the latest automake
version (1.12.4); but exercise it anyway in the testsuite, to
ensure we won't regress.

* t/tags-pr12372.sh: New test.
* t/list-of-tests.mk: Add it.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agosync: update files from upstream with "make fetch"
Stefano Lattarini [Wed, 5 Sep 2012 12:33:31 +0000 (14:33 +0200)]
sync: update files from upstream with "make fetch"

* lib/texinfo.tex: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agonews: cygnus will be removed in automake 1.13
Stefano Lattarini [Wed, 5 Sep 2012 12:32:35 +0000 (14:32 +0200)]
news: cygnus will be removed in automake 1.13

* NEWS (Future backward-incompatibilities): So document it here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agonews: some changes for 1.13 has been "de-planned"
Stefano Lattarini [Wed, 5 Sep 2012 12:29:33 +0000 (14:29 +0200)]
news: some changes for 1.13 has been "de-planned"

* NEWS (Future backward-incompatibilities): The planned Automake release
1.13 already has too much stuff on its plate; so we are not going to
In Automake 1.13, we are definitely not going to change the exact order
in which the directories in the aclocal macro search path are looked up.
Also, experience and user feedback have shown that the "obsolescent"
two-arguments invocation for AM_INIT_AUTOMAKE:

    AM_INIT_AUTOMAKE(PACKAGE-NAME, PACKAGE-VERSION)

is still useful (until at least Autoconf is fixed to offer better support
for "dynamically" package versions), so we are not going to remove
support for that usage in Automake 1.13.  For more details, see commit
v1.12.2-245-g2abe183 of 2012-08-24, "AM_INIT_AUTOMAKE: allow obsolescent
two-args invocation once again".
(New in 1.12.1): Adjust accordingly.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agonews: report that the have seen fixlets after 1.12.3
Stefano Lattarini [Wed, 5 Sep 2012 12:19:28 +0000 (14:19 +0200)]
news: report that the have seen fixlets after 1.12.3

* NEWS: Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agowarns: enable category 'obsolete' by default
Stefano Lattarini [Tue, 4 Sep 2012 12:50:49 +0000 (14:50 +0200)]
warns: enable category 'obsolete' by default

No surprise that our users were bitten by backward-incompatible changes
especially hard: the warnings in the 'obsolete' category, that might
have informed them of the upcoming incompatibilities, and help them to
prepare for the transition, where not enabled by default!

* NEWS, doc/automake.texi: Update.
* lib/Automake/ChannelDefs.pm: Enable warnings in the category 'obsolete'
by default.
* t/warnings-obsolete-default.sh: New test.
* t/list-of-tests.mk: Add it.
* t/backcompat.sh: Use 'configure.ac' rather than 'configure.in' as
autoconf input file, to avoid spurious aclocal errors.
* t/backcompat2.sh: Likewise.
* t/backcompat3.sh: Likewise.
* t/backcompat5.sh: Add '-Wno-obsolete' when invoking aclocal.  Adjust
heading comments.
* t/backcompat6.sh: Likewise.
* t/cygnus-imply-foreign.sh:  Add '-Wno-obsolete' when invoking automake.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agosync: update files from upstream with "make fetch"
Stefano Lattarini [Tue, 28 Aug 2012 07:59:22 +0000 (09:59 +0200)]
sync: update files from upstream with "make fetch"

* lib/config.guess, lib/config.sub: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agoautomake: don't define many identical 'lang_*_rewrite' subroutines
Stefano Lattarini [Wed, 6 Jun 2012 07:52:22 +0000 (09:52 +0200)]
automake: don't define many identical 'lang_*_rewrite' subroutines

This is just a simplifying refactoring, with no semantic change intended.

Cherry-picked from the Automake-NG commit 'v1.12.1-312-g63aa4a9' of
2012-06-07.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agocoverage: bugs #8844 and #9933 (already fixed by Akim's work on ylwrap)
Stefano Lattarini [Sun, 26 Aug 2012 17:25:02 +0000 (19:25 +0200)]
coverage: bugs #8844 and #9933 (already fixed by Akim's work on ylwrap)

* t/flex-header.sh: New test, show that automake bug#8844 and bug#9933
have already been fixed by the recent-ish improvements to ylwrap (merged
with commit v1.12.2-27-gec5cb49 of 2012-07-16, "Merge branch 'yacc-work'
into maint").
* t/list-of-tests.mk: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agodocs: don't suggest to use recursive makefile setup
Stefano Lattarini [Tue, 21 Aug 2012 13:03:05 +0000 (15:03 +0200)]
docs: don't suggest to use recursive makefile setup

* doc/automake.texi (Introduction): Here, by erroneously telling that
"there should generally be one Makefile.am per directory of a project".
For reference, see commit 'v1.12.1-25-g61dfb47' of 2012-06-12, "docs:
recursive make considered harmful".

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: fix a timestamp race in python tests
Adam Sampson [Thu, 16 Aug 2012 16:54:41 +0000 (18:54 +0200)]
tests: fix a timestamp race in python tests

Fixes automake bug#12210.

* t/python-missing.sh: Call aclocal and autoconf with the "--force"
option.  We need this because, on fast machines, it's possible for
'mypy.m4' and 'aclocal.m4' to end up with the same timestamp as configure,
so autoconf (without the "--force" options) wouldn't bother to rebuild it,
and would just rerun the previous AM_PATH_PYTHON test, succeeding rather
than failing as expected.
* t/python-am-path-iftrue.sh: Likewise.

Co-authored-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Copyright-paperwork-exempt: yes
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
11 years agotests: fixup: make distcheck-override-infodir pass again
Peter Rosin [Tue, 14 Aug 2012 17:34:10 +0000 (19:34 +0200)]
tests: fixup: make distcheck-override-infodir pass again

Fixes Automake bug#12198.

* t/distcheck-override-infodir.sh (main.texi): Remove all leading
cruft added by commit v1.12.2-96-g133307b "maintcheck: fix spurious
warnings".

Signed-off-by: Peter Rosin <peda@lysator.liu.se>