]> git.ipfire.org Git - thirdparty/automake.git/log
thirdparty/automake.git
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Thu, 21 Feb 2013 17:12:27 +0000 (18:12 +0100)] 
Merge branch 'master' into ng/master

* master:
  maint: more adjustments to the new versioning scheme
  aclocal: fix for more-than-once specified directories
  aclocal: just warn if the primary local m4 dir doesn't exist (don't error)
  coverage: expose automake bug#13760
  tests: refactor/enhance tests about make dry-run mode
  maint: describe new versioning and branching scheme, and adjust to it
  cosmetics: fix some "docstring-like" comments in automake

+ t/make-dryrun.tap: Several adjustments, since this test had diverged
quite significantly from the version in mainline Automake.  Particularly
relevant is the fact that Automake-NG seems immune to bug#13760, so that
some tests that are returning XFAIL in mainline automake succeeds for
Automake-NG.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint' into master
Stefano Lattarini [Thu, 21 Feb 2013 15:39:22 +0000 (16:39 +0100)] 
Merge branch 'maint' into master

* maint:
  maint: more adjustments to the new versioning scheme
  aclocal: fix for more-than-once specified directories
  aclocal: just warn if the primary local m4 dir doesn't exist (don't error)
  coverage: expose automake bug#13760
  tests: refactor/enhance tests about make dry-run mode
  maint: describe new versioning and branching scheme, and adjust to it
  cosmetics: fix some "docstring-like" comments in automake

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'branch-1.13.2' into maint
Stefano Lattarini [Thu, 21 Feb 2013 15:10:16 +0000 (16:10 +0100)] 
Merge branch 'branch-1.13.2' into maint

* branch-1.13.2:
  aclocal: fix for more-than-once specified directories
  aclocal: just warn if the primary local m4 dir doesn't exist (don't error)

12 years agomaint: more adjustments to the new versioning scheme
Stefano Lattarini [Thu, 21 Feb 2013 14:52:22 +0000 (15:52 +0100)] 
maint: more adjustments to the new versioning scheme

This is a follow-up to commit 'v1.13.1b-11-g97aaf12'.

* automake.in: Adjust a comment.
* PLANS: Adjust several files in here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'fix-pr13514' into branch-1.13.2
Stefano Lattarini [Thu, 21 Feb 2013 14:35:04 +0000 (15:35 +0100)] 
Merge branch 'fix-pr13514' into branch-1.13.2

* fix-pr13514:
  aclocal: fix for more-than-once specified directories
  aclocal: just warn if the primary local m4 dir doesn't exist (don't error)

12 years agoaclocal: fix for more-than-once specified directories
Pavel Raiskup [Mon, 11 Feb 2013 12:11:52 +0000 (13:11 +0100)] 
aclocal: fix for more-than-once specified directories

Related to automake bug#13514.

Do not consider directories for extra m4 files multiple times in
'aclocal'.  Doing so caused problems on older packages that specify

    configure.ac:  AC_CONFIG_MACRO_DIRS([m4])
    Makefile.am:   ACLOCAL_AMFLAGS = -I m4

if the 'm4' directory does not exist when aclocal is called the first
time by autoreconf.

See:
<http://lists.gnu.org/archive/html/bug-automake/2013-01/msg00115.html>

* aclocal.in (scan_m4_files): Remove duplicates in @user_includes.
* t/aclocal-macrodir.tap: Extend.
* t/aclocal-macrodirs.tap: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'docstrings-tweaks' into maint
Stefano Lattarini [Wed, 20 Feb 2013 21:15:21 +0000 (22:15 +0100)] 
Merge branch 'docstrings-tweaks' into maint

* docstrings-tweaks:
  cosmetics: fix some "docstring-like" comments in automake

12 years agoMerge branch 'branch-1.13.2' into maint
Stefano Lattarini [Wed, 20 Feb 2013 21:14:55 +0000 (22:14 +0100)] 
Merge branch 'branch-1.13.2' into maint

* branch-1.13.2:
  coverage: expose automake bug#13760
  tests: refactor/enhance tests about make dry-run mode
  maint: describe new versioning and branching scheme, and adjust to it

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'new-versioning-scheme' into branch-1.13.2
Stefano Lattarini [Wed, 20 Feb 2013 21:13:34 +0000 (22:13 +0100)] 
Merge branch 'new-versioning-scheme' into branch-1.13.2

* new-versioning-scheme:
  maint: describe new versioning and branching scheme, and adjust to it

12 years agoaclocal: just warn if the primary local m4 dir doesn't exist (don't error)
Pavel Raiskup [Mon, 11 Feb 2013 12:11:51 +0000 (13:11 +0100)] 
aclocal: just warn if the primary local m4 dir doesn't exist (don't error)

Related to automake bug#13514.

Every package which does not need to have the local m4 macro
directory pre-existing in the version control system (because
e.g., it does not have nor need any private m4 macros) would
fail during the "autoreconf -vfi" phase if AC_CONFIG_MACRO_DIRS([m4])
is specified in configure.ac (it could be to instruct tools like
'autopoint' and 'libtoolize' to use 'm4' as the local directory
where to install definitions of their m4 macros, and to instruct
aclocal to look into it).  The failure would go like this:

  autoreconf: Entering directory `.'
  autoreconf: running: aclocal --force
  aclocal: error: couldn't open directory 'm4': No such file or directory
  autoreconf: aclocal failed with exit status: 1

The problem is that when 'aclocal' is run for the first time during
'autoreconf', the directory 'm4' does not exist yet.  It will be
created by e.g., 'libtoolize' or 'autopoint' later on.  During the
second 'aclocal' run, the 'm4' directory exists and aclocal does not
complain.

To work around this issue, we degrade the error to a simple warning.
The warning is still quite useful when aclocal is run by hand - so
we are not removing completely.

See also:
<http://lists.gnu.org/archive/html/bug-automake/2013-01/msg00115.html>
<http://lists.gnu.org/archive/html/automake-patches/2010-02/msg00030.html>
<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663>
<https://bugzilla.redhat.com/show_bug.cgi?id=901333>

* aclocal.in (SCAN_M4_DIRS_SILENT, SCAN_M4_DIRS_WARN)
(SCAN_M4_DIRS_ERROR): New constants.
(scan_m4_dirs): Change the second parameter name to $ERR_LEVEL to
better reflect new semantic. Use new constants.
(scan_m4_files): Adjust to reflect the new 'scan_m4_dirs' semantics.
* t/aclocal-macrodir.tap: Adjust.
* t/aclocal-macrodirs.tap: Likewise.
* THANKS: Update.
* NEWS: Likewise.

Suggested-by: Ben Pfaff <blp@cs.stanford.edu>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agocoverage: expose automake bug#13760
Stefano Lattarini [Wed, 20 Feb 2013 12:25:39 +0000 (13:25 +0100)] 
coverage: expose automake bug#13760

* t/make-dryrun.tap: Here.
* THANKS: Update with the name of the bug reporter.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: refactor/enhance tests about make dry-run mode
Stefano Lattarini [Wed, 20 Feb 2013 11:44:50 +0000 (12:44 +0100)] 
tests: refactor/enhance tests about make dry-run mode

* t/make-dryrun.tap: Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: describe new versioning and branching scheme, and adjust to it
Stefano Lattarini [Sun, 17 Feb 2013 09:25:29 +0000 (10:25 +0100)] 
maint: describe new versioning and branching scheme, and adjust to it

See discussion about automake bug#13578 for more details and background.

Basically, for the versioning scheme:

  - micro versions only for bug and regression fixing;
  - minor versions for new backward-compatible features, and new
    non-fatal deprecations;
  - major versions for backward-incompatibilities, complex new
    features, and major refactoring.

And for the git branching scheme:

  + branch 'next' is for the upcoming major version;
  + branch 'master' is now for the upcoming minor version;
  + branch 'maint' is for the upcoming micro (bug-fixing) version;
  + the merging hierarchy is: 'maint' -> 'master' -> 'next'.

* HACKING (Automake versioning and compatibility scheme): New.
(Working with git): Adjust.
* NEWS: Update and fix.
* aclocal.in: Adjust some "FIXME" messages.
* automake.in: Likewise.
* m4/mkdirp.m4: Likewise.
* t/aclocal-acdir.sh: Likewise.
* t/aclocal-macrodir.tap: Likewise.
* t/aclocal-macrodirs.tap: Likewise.
* lib/Automake/Options.pm: Likewise.
* m4/internal/ac-config-macro-dirs.m4: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agocosmetics: fix some "docstring-like" comments in automake
Stefano Lattarini [Sat, 16 Feb 2013 23:04:28 +0000 (00:04 +0100)] 
cosmetics: fix some "docstring-like" comments in automake

* automake.in: Here.  And remove some redundant ones.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Sat, 16 Feb 2013 22:22:08 +0000 (23:22 +0100)] 
Merge branch 'master' into ng/master

* master: (41 commits)
  typofix: in comments in 't/ax/test-lib.sh'
  style: call perl functions 'like_this()', not '&like_this()'
  tests on TAP: don't run the driver with perl unconditionally
  typofix: in comments in 'automake.in'
  tests: remove obsolete (and now wrong) comment
  typofix: in diagnostic in test 't/tap-realtime.sh'
  maint: use more perl subroutines prototypes in the automake script
  build: auto-generate perl subroutines prototypes for automake and aclocal
  refactor: rip module Automake::Language out of automake script
  automake: fix reference to relevant tests in comments
  NEWS: we no longer plan to drop $(INCLUDES) support in next major version
  NEWS: IRIX is still supported; only SGI depmode no longer is
  NEWS: IRIX is still supported; only SGI C compiler depcomp no longer is
  coverage: split info files are not installed nor distributed
  maint: version bump after beta release 1.13.1b
  NEWS: typofix
  release: beta release 1.13.1b (will become 1.13.2)
  docs: '.txi' and '.texinfo' extensions are deprecated
  NEWS: document recent documentation improvements
  docs: more precise cross reference
  ...

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Sat, 16 Feb 2013 18:39:07 +0000 (19:39 +0100)] 
Merge branch 'maint'

* maint:
  style: call perl functions 'like_this()', not '&like_this()'
  maint: use more perl subroutines prototypes in the automake script
  build: auto-generate perl subroutines prototypes for automake and aclocal
  refactor: rip module Automake::Language out of automake script

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'perl-sub-protos' into maint
Stefano Lattarini [Sat, 16 Feb 2013 17:54:19 +0000 (18:54 +0100)] 
Merge branch 'perl-sub-protos' into maint

* perl-sub-protos:
  style: call perl functions 'like_this()', not '&like_this()'
  maint: use more perl subroutines prototypes in the automake script
  build: auto-generate perl subroutines prototypes for automake and aclocal
  refactor: rip module Automake::Language out of automake script

12 years agoMerge branch 'maint'
Stefano Lattarini [Fri, 15 Feb 2013 14:39:02 +0000 (15:39 +0100)] 
Merge branch 'maint'

* maint:
  typofix: in comments in 't/ax/test-lib.sh'
  tests on TAP: don't run the driver with perl unconditionally
  typofix: in comments in 'automake.in'
  tests: remove obsolete (and now wrong) comment
  typofix: in diagnostic in test 't/tap-realtime.sh'
  automake: fix reference to relevant tests in comments
  NEWS: we no longer plan to drop $(INCLUDES) support in next major version

12 years agoMerge branch 'branch-1.13.2' into maint
Stefano Lattarini [Fri, 15 Feb 2013 14:06:19 +0000 (15:06 +0100)] 
Merge branch 'branch-1.13.2' into maint

* branch-1.13.2:
  typofix: in comments in 't/ax/test-lib.sh'
  tests on TAP: don't run the driver with perl unconditionally
  typofix: in comments in 'automake.in'
  tests: remove obsolete (and now wrong) comment
  typofix: in diagnostic in test 't/tap-realtime.sh'
  automake: fix reference to relevant tests in comments
  NEWS: we no longer plan to drop $(INCLUDES) support in next major version

12 years agotypofix: in comments in 't/ax/test-lib.sh'
Stefano Lattarini [Tue, 29 Jan 2013 12:24:50 +0000 (13:24 +0100)] 
typofix: in comments in 't/ax/test-lib.sh'

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agostyle: call perl functions 'like_this()', not '&like_this()'
Stefano Lattarini [Wed, 13 Feb 2013 18:39:38 +0000 (19:39 +0100)] 
style: call perl functions 'like_this()', not '&like_this()'

We can do so now that our build rules auto-generate a list of
prototypes for all functions ins our scripts.

* automake.in: Adjust throughout.
* HACKING: Adjust advises.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests on TAP: don't run the driver with perl unconditionally
Stefano Lattarini [Thu, 14 Feb 2013 11:32:27 +0000 (12:32 +0100)] 
tests on TAP: don't run the driver with perl unconditionally

* t/ax/tap-setup.sh: When a 'Makefile.am' was pre-existent in the
test directory at the moment the client test script sourced this
file, said 'Makefile.am' was tweaked to provide it with a proper
definition of TEST_LOG_DRIVER.  However, there was an error in this
automatic definition, since it caused the TAP test driver to be
unconditionally invoked with perl.  This wasn't an issue in most
situations, since perl is smart enough to re-execute a given script
with the proper interpreter if it sees a she-bang line that doesn't
seem to point to perl itself.  Still, there is no reason to do
something blatantly wrong even if our tools correct the dumb mistake
for us.  So fix the TEST_LOG_DRIVER definition.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotypofix: in comments in 'automake.in'
Stefano Lattarini [Thu, 14 Feb 2013 11:09:43 +0000 (12:09 +0100)] 
typofix: in comments in 'automake.in'

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: remove obsolete (and now wrong) comment
Stefano Lattarini [Thu, 14 Feb 2013 10:46:58 +0000 (11:46 +0100)] 
tests: remove obsolete (and now wrong) comment

* t/ax/am-test-lib.sh: Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotypofix: in diagnostic in test 't/tap-realtime.sh'
Stefano Lattarini [Thu, 14 Feb 2013 10:46:49 +0000 (11:46 +0100)] 
typofix: in diagnostic in test 't/tap-realtime.sh'

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: use more perl subroutines prototypes in the automake script
Stefano Lattarini [Mon, 4 Feb 2013 22:37:23 +0000 (23:37 +0100)] 
maint: use more perl subroutines prototypes in the automake script

* automake.in: Throughout this file.  Note that these new prototypes
are not much useful, since many subroutine calls still use the old
'&foo' form; but we'll take care of that in later patches.
* lib/Automake/Language.pm (target_hook): Call the '_target_hook'
of the given language in a more modern form, avoiding '&'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agobuild: auto-generate perl subroutines prototypes for automake and aclocal
Stefano Lattarini [Mon, 4 Feb 2013 22:04:18 +0000 (23:04 +0100)] 
build: auto-generate perl subroutines prototypes for automake and aclocal

This will allow us to avoid either using the '&foo' invocation form when
invoking a subroutine before its definition, or having to maintain the
list of prototypes by hand (with the risk of having it become incomplete
or fall out-of-sync when future edits to the automake and aclocal scripts
are done).

* Makefile.am (automake, aclocal): Automatically generate a list of
prototypes by looking at the subroutines definitions.
* bootstrap.sh: Likewise, when generating the temporary automake and
aclocal scripts used for bootstrapping.
* automake.in: Add a placeholder that will be tracked by the new recipes
and substituted with the computed prototypes.  Remove existing prototypes,
that are now superfluous. Some adjustments required by the new, more
comprehensive prototypes declarations.
* aclocal.in: Likewise.
* maintainer/syntax-checks.mk (sc_diff_automake, sc_diff_aclocal): Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agorefactor: rip module Automake::Language out of automake script
Stefano Lattarini [Mon, 4 Feb 2013 18:34:03 +0000 (19:34 +0100)] 
refactor: rip module Automake::Language out of automake script

This is just a preparatory patch in view of future changes.

* lib/Automake/Language.pm: New module, ripped out from ...
* automake.in: ... here.  Related adjustments.
* Makefile.am (dist_perllib_DATA): List the new module.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoautomake: fix reference to relevant tests in comments
Stefano Lattarini [Sun, 3 Feb 2013 19:44:32 +0000 (20:44 +0100)] 
automake: fix reference to relevant tests in comments

Some of those tests had been renamed in recent or less-recent changes.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoNEWS: we no longer plan to drop $(INCLUDES) support in next major version
Stefano Lattarini [Sun, 3 Feb 2013 19:16:01 +0000 (20:16 +0100)] 
NEWS: we no longer plan to drop $(INCLUDES) support in next major version

For a rationale and related discussion, see:
<http://lists.gnu.org/archive/html/automake/2013-02/msg00001.html>

And note that support for INCLUDES has not been re-introduced in the
master branch yet, at the moment of writing; but we plan to definitely
do so before the next major release.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoNEWS: IRIX is still supported; only SGI depmode no longer is
Stefano Lattarini [Mon, 28 Jan 2013 12:41:55 +0000 (13:41 +0100)] 
NEWS: IRIX is still supported; only SGI depmode no longer is

This change is for the master branch (see the similar commit
'v1.13.1b-3-g97f04a5' on the maint branch).

The only IRIX-specific support that is actually removed in master (and
thus in the next major Automake version) is the depcomp support for the
SGI compiler.  That means that automatic dependency tracking will no
longer work with that compiler, but "normal" compilation should still
work, at least until the compiler is supported by Autoconf.

So there is no point in alarming our users by stating in the NEWS file
that "support for IRIX and the SGI compilers has been removed"; after
all, while we don't test on nor particularly care about IRIX anymore,
that doesn't mean we are deliberately breaking it, and the likelihood
of an intended breakage there is very low.

See:
<http://lists.gnu.org/archive/html/automake-patches/2013-01/msg00164.html>
<http://lists.gnu.org/archive/html/automake-patches/2013-01/msg00165.html>

* NEWS: Adjust.  Improve explanation of our rationale for dropping
support for the SGI compilers.

Suggested-by: Peter Rosin <peda@lysator.liu.se>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Mon, 28 Jan 2013 12:35:40 +0000 (13:35 +0100)] 
Merge branch 'maint'

* maint:
  NEWS: IRIX is still supported; only SGI C compiler depcomp no longer is
  maint: version bump after beta release 1.13.1b
  NEWS: typofix
  release: beta release 1.13.1b (will become 1.13.2)

12 years agoMerge branch 'branch-1.13.2' into maint
Stefano Lattarini [Mon, 28 Jan 2013 12:33:00 +0000 (13:33 +0100)] 
Merge branch 'branch-1.13.2' into maint

* branch-1.13.2:
  NEWS: IRIX is still supported; only SGI C compiler depcomp no longer is
  maint: version bump after beta release 1.13.1b
  NEWS: typofix
  release: beta release 1.13.1b (will become 1.13.2)

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoNEWS: IRIX is still supported; only SGI C compiler depcomp no longer is
Stefano Lattarini [Mon, 28 Jan 2013 12:22:12 +0000 (13:22 +0100)] 
NEWS: IRIX is still supported; only SGI C compiler depcomp no longer is

This change is for the maint branch.

The only IRIX-specific support that is going to actually be removed in
the next major Automake versions is the depcomp support for the SGI
compiler.  That means that automatic dependency tracking will no
longer work with that compiler, but "normal" compilation should still
work, at least until the compiler is supported by Autoconf.

So there is no point in alarming our users by stating in the NEWS file
that "support for IRIX and the SGI compilers is going to be removed";
after all, while we don't test on nor particularly care about IRIX
anymore, that doesn't mean we are deliberately breaking it, and the
likelihood of an intended breakage there is very low.

See:
<http://lists.gnu.org/archive/html/automake-patches/2013-01/msg00164.html>
<http://lists.gnu.org/archive/html/automake-patches/2013-01/msg00165.html>

* NEWS (Future backward-incompatibilities: Adjust.  Improve explanation
of our rationale for dropping SGI support. Fix an unrelated typo while
at it.

Suggested-by: Peter Rosin <peda@lysator.liu.se>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agocoverage: split info files are not installed nor distributed
Stefano Lattarini [Wed, 23 Jan 2013 11:00:04 +0000 (12:00 +0100)] 
coverage: split info files are not installed nor distributed

See automake bugs #12320 and #13351.

* t/txinfo-no-extra-dist.sh: Enhance.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: version bump after beta release 1.13.1b
Stefano Lattarini [Wed, 23 Jan 2013 10:38:33 +0000 (11:38 +0100)] 
maint: version bump after beta release 1.13.1b

* configure.ac (AC_INIT): Bump version number to 1.13.1c.
* m4/amversion.m4: Likewise (autoupdated by "make bootstrap").

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoNEWS: typofix
Stefano Lattarini [Wed, 23 Jan 2013 10:33:09 +0000 (11:33 +0100)] 
NEWS: typofix

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agorelease: beta release 1.13.1b (will become 1.13.2) v1.13.1b
Stefano Lattarini [Wed, 23 Jan 2013 10:05:01 +0000 (11:05 +0100)] 
release: beta release 1.13.1b (will become 1.13.2)

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

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Tue, 22 Jan 2013 12:49:02 +0000 (13:49 +0100)] 
Merge branch 'maint'

* maint:
  docs: '.txi' and '.texinfo' extensions are deprecated
  NEWS: document recent documentation improvements
  docs: more precise cross reference
  docs: 'dist-shar' and 'dist-tarZ' are obsolescent today
  docs: improve documentation of 'dist-*' targets slightly
  docs: make even clearer 'dist-gzip' is the default.
  docs: document 'dist-xz' together with the other 'dist-*' options
  docs: 'no-define' option and AM_INIT_AUTOMAKE three-args usage: fixlets
  warn: correct broken hyperlink in warning message

12 years agoMerge branch 'branch-1.13.2' into maint
Stefano Lattarini [Tue, 22 Jan 2013 12:37:41 +0000 (13:37 +0100)] 
Merge branch 'branch-1.13.2' into maint

* branch-1.13.2:
  docs: '.txi' and '.texinfo' extensions are deprecated
  NEWS: document recent documentation improvements
  docs: more precise cross reference
  docs: 'dist-shar' and 'dist-tarZ' are obsolescent today
  docs: improve documentation of 'dist-*' targets slightly
  docs: make even clearer 'dist-gzip' is the default.
  docs: document 'dist-xz' together with the other 'dist-*' options
  docs: 'no-define' option and AM_INIT_AUTOMAKE three-args usage: fixlets
  warn: correct broken hyperlink in warning message

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agodocs: '.txi' and '.texinfo' extensions are deprecated
Stefano Lattarini [Tue, 22 Jan 2013 12:28:38 +0000 (13:28 +0100)] 
docs: '.txi' and '.texinfo' extensions are deprecated

And Automake will warn about them (since commit 'v1.13.1-6-ge1ed314').

* doc/automake.texi (Texinfo): Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoNEWS: document recent documentation improvements
Stefano Lattarini [Tue, 22 Jan 2013 12:14:41 +0000 (13:14 +0100)] 
NEWS: document recent documentation improvements

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agodocs: more precise cross reference
Stefano Lattarini [Tue, 22 Jan 2013 12:02:25 +0000 (13:02 +0100)] 
docs: more precise cross reference

See automake bug#13520.

* doc/automake.texi (The Types of Distributions): Here,
cross-reference "List of Automake options" rather then
the more generic node "Options".  Improve wording while
at it.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agodocs: 'dist-shar' and 'dist-tarZ' are obsolescent today
Stefano Lattarini [Tue, 22 Jan 2013 11:30:15 +0000 (12:30 +0100)] 
docs: 'dist-shar' and 'dist-tarZ' are obsolescent today

Both the options and the formats; and they might be deprecated
and removed in future automake versions (see discussion on
automake bug#13324).

In any case, it's better if the documentation starts advising
against their use right now.

* doc/automake.texi (The Types of Distributions): Here.
(List of Automake options): And here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agodocs: improve documentation of 'dist-*' targets slightly
Stefano Lattarini [Tue, 22 Jan 2013 11:14:20 +0000 (12:14 +0100)] 
docs: improve documentation of 'dist-*' targets slightly

* doc/automake.texi (The Types of Distributions): Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agodocs: make even clearer 'dist-gzip' is the default.
Stefano Lattarini [Tue, 22 Jan 2013 11:08:43 +0000 (12:08 +0100)] 
docs: make even clearer 'dist-gzip' is the default.

See automake bug#13520.

* doc/automake.texi (The Types of Distributions): Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agodocs: document 'dist-xz' together with the other 'dist-*' options
Stefano Lattarini [Tue, 22 Jan 2013 11:03:35 +0000 (12:03 +0100)] 
docs: document 'dist-xz' together with the other 'dist-*' options

See automake bug#13520.

* doc/automake.texi (List of Automake options): Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agodocs: 'no-define' option and AM_INIT_AUTOMAKE three-args usage: fixlets
Stefano Lattarini [Tue, 22 Jan 2013 09:56:57 +0000 (10:56 +0100)] 
docs: 'no-define' option and AM_INIT_AUTOMAKE three-args usage: fixlets

See automake bug#13519.

* doc/automake.texi: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agowarn: correct broken hyperlink in warning message
Stefano Lattarini [Tue, 22 Jan 2013 09:49:17 +0000 (10:49 +0100)] 
warn: correct broken hyperlink in warning message

* automake.in (scan_autoconf_traces): Here, when an use of the
deprecated two- and three-arguments forms of AM_INIT_AUTOMAKE
is detected.

Fixes automake bug#13519.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Mon, 21 Jan 2013 14:48:48 +0000 (15:48 +0100)] 
Merge branch 'maint'

* maint:
  tests: more information about Lex and Yacc programs
  lint: fix spurious failure for 'sc_rm_minus_f' syntax check
  maint: bump version 1.13.1a -> 1.13.2a
  maint: update copyright in files generated by automake and aclocal
  tests: avoid a spurious failure when running inside Emacs
  tests: make two new test executable
  m4: rename an m4 file to a more appropriate name
  NEWS: update w.r.t. recent documentation fixes
  compat: reinstate AM_CONFIG_HEADER and AM_PROG_CC_STDC
  docs: parallel-tests is no longer experimental
  docs: serial-tests are not deprecated, just discouraged
  plans: we are not going to remove AM_PROG_MKDIR_P in Automake 1.14
  NEWS: we are not going to remove AM_PROG_MKDIR_P in Automake 1.14
  init.m4: add probe to check "rm -f" without args work

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: more information about Lex and Yacc programs
Stefano Lattarini [Mon, 21 Jan 2013 14:45:17 +0000 (15:45 +0100)] 
tests: more information about Lex and Yacc programs

* t/get-sysconf.sh: Try to also get the version of '$LEX' and '$YACC'.
This will help debugging of user-reported problems.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agolint: fix spurious failure for 'sc_rm_minus_f' syntax check
Stefano Lattarini [Mon, 21 Jan 2013 14:35:48 +0000 (15:35 +0100)] 
lint: fix spurious failure for 'sc_rm_minus_f' syntax check

* maintainer/syntax-checks.mk (sc_rm_minus_f): Also exempt
file 't/rm-f-probe.sh'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: bump version 1.13.1a -> 1.13.2a
Stefano Lattarini [Mon, 21 Jan 2013 14:24:03 +0000 (15:24 +0100)] 
maint: bump version 1.13.1a -> 1.13.2a

The 1.13.2 bug-fixing release will ship from the 'branch-1.13.2' git
branch, not from the 'maint' one, since the latter contains changes
that are non-trivial and hasn't cooked enough yet.  The 'maint' branch
will give rise to the 1.13.3 release instead, eventually.  Adjust the
version number to match.

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

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'branch-1.13.2' into maint
Stefano Lattarini [Mon, 21 Jan 2013 13:52:37 +0000 (14:52 +0100)] 
Merge branch 'branch-1.13.2' into maint

That branch is for the "emergency" bug-fixing release 1.13.2.

* branch-1.13.2:
  maint: update copyright in files generated by automake and aclocal
  tests: avoid a spurious failure when running inside Emacs
  tests: make two new test executable
  m4: rename an m4 file to a more appropriate name
  NEWS: update w.r.t. recent documentation fixes
  compat: reinstate AM_CONFIG_HEADER and AM_PROG_CC_STDC
  docs: parallel-tests is no longer experimental
  docs: serial-tests are not deprecated, just discouraged
  NEWS: we are not going to remove AM_PROG_MKDIR_P in Automake 1.14

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: update copyright in files generated by automake and aclocal
Stefano Lattarini [Mon, 21 Jan 2013 13:47:00 +0000 (14:47 +0100)] 
maint: update copyright in files generated by automake and aclocal

* bootstrap.sh ($RELEASE_YEAR): Bump top 2013.
* configure.ac ($RELEASE_YEAR): Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: avoid a spurious failure when running inside Emacs
Thien-Thi Nguyen [Mon, 21 Jan 2013 12:35:03 +0000 (13:35 +0100)] 
tests: avoid a spurious failure when running inside Emacs

Some versions of Emacs set the environment variable 'EMACS' to 't'
for child processes.  Thus, when running from inside Emacs, "$(MAKE) -e"
erroneously allows the 't' to override the one in the Makefile.

* t/lisp-flags.sh: Unset var 'EMACS', fixing the issue.

Copyright-paperwork-exempt: yes
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: make two new test executable
Stefano Lattarini [Thu, 3 Jan 2013 12:42:20 +0000 (13:42 +0100)] 
tests: make two new test executable

* t/backslash-issues.sh: This.
* t/extra-data.sh: And this.

Issue revealed by the 'sc_tests_executable' maintainer check.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agom4: rename an m4 file to a more appropriate name
Stefano Lattarini [Fri, 18 Jan 2013 12:39:38 +0000 (13:39 +0100)] 
m4: rename an m4 file to a more appropriate name

* m4/obsolete-err.m4: Rename ...
* m4/obsolete.m4: ... like this.
* Makefile.am (dist_automake_ac_DATA): Adjust.
* t/ansi2knr-no-more.sh: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoNEWS: update w.r.t. recent documentation fixes
Stefano Lattarini [Fri, 18 Jan 2013 12:32:12 +0000 (13:32 +0100)] 
NEWS: update w.r.t. recent documentation fixes

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agocompat: reinstate AM_CONFIG_HEADER and AM_PROG_CC_STDC
Stefano Lattarini [Fri, 18 Jan 2013 12:13:30 +0000 (13:13 +0100)] 
compat: reinstate AM_CONFIG_HEADER and AM_PROG_CC_STDC

Make them give runtime warnings in the obsolete category, but apart
from that, make them behave as they did in Automake 1.12.x and earlier.

While removing those macros seemed quite harmless, because it didn't put
a real burden on the developers (requiring them just to do a quick edit
to configure.ac), it turned out to place an unsustainable burden (or at
least, a burden perceived as such) on distro packagers who use the latest
Automake to bootstrap existing packages.  Many of those packages, while
having likely updated to AC_CONFIG_HEADERS in their development version,
still used AM_CONFIG_HEADER in their existing released versions, and the
removal of this macro would have thus forced the Fedora packagers to
patch all of them.  References:

  <http://www.mail-archive.com/devel@lists.fedoraproject.org/msg52840.html>
  <http://www.spinics.net/lists/fedora-devel/msg175922.html>
  <http://blog.flameeyes.eu/2013/01/autotools-mythbuster-automake-pains>

In addition, the Fedora packagers have already decided to patch their
Automake 1.13.1 to reinstate the AM_CONFIG_HEADER and AM_PROG_CC_STDC
macros (plus other macros that I don't believe it's worth worrying about):

  <http://www.spinics.net/lists/fedora-devel/msg176098.html>
  <http://www.mail-archive.com/devel@lists.fedoraproject.org/msg53030.html>
  <http://pkgs.fedoraproject.org/cgit/automake.git/commit/?id=ffe6bc39>

So, rather than having one more incompatibility floating around, we
better mirror that change (or, actually, its relevant parts) in the
upstream.

* m4/obsolete-err.m4 (AM_CONFIG_HEADER, AM_PROG_CC_STDC): Revert to the
older semantics, plus a runtime warning in the 'obsolete' category.
* t/backcompat6.sh: Use AM_CONFIG_HEADER once again.
* t/am-config-header-no-more.sh: Rename ...
* t/am-config-header.sh: ... like this, and adjust.
* t/am-prog-cc-stdc-no-more.sh: Rename ...
* t/am-prog-cc-stdc.sh: ... like this, and adjust.
* t/list-of-tests.mk: Adjust.
* NEWS: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'rm-f-probe' into maint
Stefano Lattarini [Fri, 18 Jan 2013 15:28:54 +0000 (16:28 +0100)] 
Merge branch 'rm-f-probe' into maint

* rm-f-probe:
  init.m4: add probe to check "rm -f" without args work

12 years agodocs: parallel-tests is no longer experimental
Stefano Lattarini [Fri, 18 Jan 2013 11:02:23 +0000 (12:02 +0100)] 
docs: parallel-tests is no longer experimental

So don't declare it as such in the documentation.

Reported by Brandon Black:
<http://lists.gnu.org/archive/html/automake/2013-01/msg00052.html>

* doc/automake.texi: Adjust.
* THANKS: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agodocs: serial-tests are not deprecated, just discouraged
Stefano Lattarini [Fri, 18 Jan 2013 10:39:28 +0000 (11:39 +0100)] 
docs: serial-tests are not deprecated, just discouraged

We don't plan to remove support for them, nor to have the serial-tests
option give any kind of runtime warning, so don't alarm the users
still using serial tests with pointless "deprecation" or "obsolescence"
warnings.

Fixes automake bug#13478.

See also:
<http://lists.gnu.org/archive/html/automake/2013-01/msg00058.html>

* doc/automake.texi: Adjust.
* THANKS: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoNEWS (master): we are not going to remove AM_PROG_MKDIR_P in 1.14
Stefano Lattarini [Fri, 18 Jan 2013 10:24:38 +0000 (11:24 +0100)] 
NEWS (master): we are not going to remove AM_PROG_MKDIR_P in 1.14

See commit v1.13.1-109-g030ecb4 of 2013-01-16, "compat: restore
AM_PROG_MKDIR, again", for the rationale.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoplans: we are not going to remove AM_PROG_MKDIR_P in Automake 1.14
Stefano Lattarini [Fri, 18 Jan 2013 10:22:01 +0000 (11:22 +0100)] 
plans: we are not going to remove AM_PROG_MKDIR_P in Automake 1.14

See commit v1.13.1-109-g030ecb4 of 2013-01-16, "compat: restore
AM_PROG_MKDIR, again", for the rationale; that rationale is now
also copied...

* PLANS/obsolete-removed/am-prog-mkdir-p.txt: ... here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoNEWS: we are not going to remove AM_PROG_MKDIR_P in Automake 1.14
Stefano Lattarini [Fri, 18 Jan 2013 10:04:25 +0000 (11:04 +0100)] 
NEWS: we are not going to remove AM_PROG_MKDIR_P in Automake 1.14

See commit v1.13.1-109-g030ecb4 of 2013-01-16, "compat: restore
AM_PROG_MKDIR, again", for the rationale.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Wed, 16 Jan 2013 13:28:43 +0000 (14:28 +0100)] 
Merge branch 'master' into ng/master

* master:
  compat: restore AM_PROG_MKDIR, again
  subdir-objects: complain if it isn't enabled
  plans: update w.r.t. latest changes
  ywrap: remove an obsolete FIXME comment
  ywrap: style fixes (no semantic change intended)
  convenience: "make lint" as an alias for "make maintainer-check"
  docs: typofix in manual
  coverage: using multiple lexers in a single program
  texi: no longer support split info files

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'texi-no-split-info'
Stefano Lattarini [Wed, 16 Jan 2013 12:35:10 +0000 (13:35 +0100)] 
Merge branch 'texi-no-split-info'

* texi-no-split-info:
  texi: no longer support split info files

12 years agoMerge branch 'maint'
Stefano Lattarini [Wed, 16 Jan 2013 12:20:12 +0000 (13:20 +0100)] 
Merge branch 'maint'

* maint:
  subdir-objects: complain if it isn't enabled
  plans: update w.r.t. latest changes

12 years agocompat: restore AM_PROG_MKDIR, again
Stefano Lattarini [Mon, 14 Jan 2013 19:43:24 +0000 (20:43 +0100)] 
compat: restore AM_PROG_MKDIR, again

OK, this is getting ridiculous, but we cannot remove this macro yet
(and, yes, the fault for this mess lies entirely on me; let's not
dwell on that, thank you very much).

Gettext (so far the greatest "offender" in the use of AM_PROG_MKDIR), in
its latest release 0.18.2, has removed all the uses of that macro still
present in its code base.  So I thought we could finally and safely
remove it.  Wrong.  If a package's 'configure.ac' contains a call like:

   AM_GNU_GETTEXT_VERSION([0.18])

then the 'autopoint' script will bring the data files from the Gettext
release *1.18* into the package's tree -- yes, even even if the developer
has installed *and is using* Gettext 1.18.2!  Now, these data files
comprise m4 files (that will be seen by subsequent aclocal and autoconf
calls), and of course, the pre-0.18.2 version of some of these files
still contains occurrences of AM_PROG_MKDIR_P -- so Automake 1.13 errors
out, and we lose.  This has already happened in practice:

  <http://lists.gnu.org/archive/html/bug-grep/2013-01/msg00003.html>

Moreover, while we might see it as not unreasonable to ask a developer
using Automake 1.14 to also update Gettext to 1.18.2, that would not
be enough; in order for gettext to use the correct data files, our
developer would have to update his configure.ac to read:

   AM_GNU_GETTEXT_VERSION([0.18.2])

thus requiring *all* of his co-developers to install Gettext 1.18.2,
even if they are still using, say, Automake 1.13.  Bad.

So we re-instate this macro as a simple alias for AC_PROG_MKDIR (plus
a non-fatal runtime warning in the 'obsolete' category), and drop any
plan to remove it (see how much good those plans have done us so far).

Note that NEWS is not yet adjusted, since we'll have to adjust it in
maint before (to minimize spurious merge conflicts).

* doc/automake.texi: Update.
* PLANS/obsolete-removed/am-prog-mkdir-p.txt: Likewise.
* t/gettext-macros.sh: Adjust.
* t/am-prog-mkdir-p.sh: New test.
* t/mkdir_p.sh: Remove, folded into the new one.
* t/am-prog-mkdir-p-no-more: Remove as superseded.
* t/list-of-tests.mk: Adjust.
* t/obsolete-err.m4: Re-instate AM_PROG_MKDIR_P as a working
alias for AC_PROG_MKDIR_P (albeit giving runtime warnings, and
calling AC_SUBST on 'mkdir_p' too).
* m4/init.m4 (AM_INIT_AUTOMAKE): No longer call AC_SUBST for
'mkdir_p', as that is once again AM_PROG_MKDIR_P's business.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoinit.m4: add probe to check "rm -f" without args work
Stefano Lattarini [Sat, 12 Jan 2013 18:20:54 +0000 (19:20 +0100)] 
init.m4: add probe to check "rm -f" without args work

See automake bug#10828.

POSIX will say in a future version that running "rm -f" with no argument
is OK: <http://austingroupbugs.net/view.php?id=542>).

We want to be able to make that assumption in our Makefile recipes.
So we introduce an aggressive probe to check that the usage we want is
actually supported "in the wild" to an acceptable degree.

* m4/init.m4 (AM_INIT_AUTOMAKE): Implement the probe.  To make any issue
more visible, cause the running configure to be aborted by default if
the 'rm' program in use doesn't match our expectations; the user can
still override this though, by setting the ACCEPT_INFERIOR_RM_PROGRAM
environment variable to "yes".

* t/spy-rm.tap: Update heading comments.
* t/rm-f-probe.sh: New test.
* t/list-of-tests.mk: Add it.
* PLANS/rm-f-without-args.txt: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agosubdir-objects: complain if it isn't enabled
Stefano Lattarini [Sun, 13 Jan 2013 16:50:30 +0000 (17:50 +0100)] 
subdir-objects: complain if it isn't enabled

Since the next major automake version will make the behaviour so far
only activated with the 'subdir-object' option mandatory, it's better
if we start warning users not using that option.

As suggested by Peter Johansson, we strive to avoid the warning when
it would be irrelevant, i.e., if all source files sit in "current"
directory.

See automake bug#13378.

* automake.in (handle_single_transform): Print the warning when
necessary.
* t/subobj.sh: Enhance.
* t/ax/depcomp.sh: Adjust.
* t/cscope.tap: Likewise.
* t/depcomp8a.sh: Likewise.
* t/depcomp8b.sh: Likewise.
* t/ext2.sh: Likewise.
* t/extra-portability.sh: Likewise.
* t/fort2.sh: Likewise.
* t/fort4.sh: Likewise.
* t/fort5.sh: Likewise.
* t/lex-line.sh: Likewise.
* t/libtool3.sh: Likewise.
* t/ltinstloc.sh: Likewise.
* t/ltlibsrc.sh: Likewise.
* t/ltorder.sh: Likewise.
* t/parallel-tests-suffix-prog.sh: Likewise.
* t/sourcefile-in-subdir.sh: Likewise.
* t/specflg9.sh: Likewise.
* t/subobj4.sh: Likewise.
* t/subobj7.sh: Likewise.
* t/subpkg-yacc.sh: Likewise.
* t/subpkg.sh: Likewise.
* t/suffix-custom-subobj-and-specflg.sh: Likewise.
* t/vala-libs.sh: Likewise.
* t/vala-non-recursive-setup.sh: Likewise.
* t/yacc-grepping2.sh: Likewise.
* t/yacc-line.sh: Likewise.

12 years agoplans: update w.r.t. latest changes
Stefano Lattarini [Sat, 12 Jan 2013 17:42:43 +0000 (18:42 +0100)] 
plans: update w.r.t. latest changes

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Sat, 12 Jan 2013 17:19:44 +0000 (18:19 +0100)] 
Merge branch 'maint'

* maint:
  ywrap: remove an obsolete FIXME comment
  ywrap: style fixes (no semantic change intended)
  convenience: "make lint" as an alias for "make maintainer-check"
  docs: typofix in manual
  coverage: using multiple lexers in a single program

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoywrap: remove an obsolete FIXME comment
Stefano Lattarini [Sat, 12 Jan 2013 16:53:17 +0000 (17:53 +0100)] 
ywrap: remove an obsolete FIXME comment

If it were still relevant, somebody would have complained by now.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoywrap: style fixes (no semantic change intended)
Stefano Lattarini [Sat, 12 Jan 2013 16:52:44 +0000 (17:52 +0100)] 
ywrap: style fixes (no semantic change intended)

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoconvenience: "make lint" as an alias for "make maintainer-check"
Stefano Lattarini [Sat, 12 Jan 2013 16:41:58 +0000 (17:41 +0100)] 
convenience: "make lint" as an alias for "make maintainer-check"

* maintainer/syntax-checks.mk (lint): Here.  I'm a lazy typist ...

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agodocs: typofix in manual
Stefano Lattarini [Sat, 12 Jan 2013 16:38:32 +0000 (17:38 +0100)] 
docs: typofix in manual

* doc/automake.texi (Yacc and Lex): Here, don't write "automake -i"
where "automake -a" is actually intended.  Re-wrap some text while
at it.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agocoverage: using multiple lexers in a single program
Stefano Lattarini [Sat, 12 Jan 2013 16:30:32 +0000 (17:30 +0100)] 
coverage: using multiple lexers in a single program

Using Flex and Automake built-in support for lex, that is possible.
A little tricky, but not difficult.

See:
<http://lists.gnu.org/archive/html/automake/2010-10/msg00081.html>
<http://lists.gnu.org/archive/html/automake/2009-03/msg00061.html>

* t/lex-multiple.sh: New test.
* t/list-of-tests.mk: Add it.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: remove $(AM_MAKEFLAGS) usage in our Makefile
Stefano Lattarini [Sat, 12 Jan 2013 16:17:27 +0000 (17:17 +0100)] 
maint: remove $(AM_MAKEFLAGS) usage in our Makefile

* Makefile.am (check-cc-no-c-o): Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: remove a couple of 'using_gmake' calls
Stefano Lattarini [Sat, 12 Jan 2013 16:13:23 +0000 (17:13 +0100)] 
tests: remove a couple of 'using_gmake' calls

In the Automake-NG testsuite, $MAKE is always GNU make.

* t/remake-config-status-dependencies.sh: Don't call
'using_gmake'; assume it would unconditionally return true.
* t/remake-configure-dependencies.sh: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaintcheck: fixlet: maint.mk is in 'maintainer/' now
Stefano Lattarini [Sat, 12 Jan 2013 16:06:35 +0000 (17:06 +0100)] 
maintcheck: fixlet: maint.mk is in 'maintainer/' now

* maintainer/syntax-checks.mk (sc_mkinstalldirs): So adjust this
rule's recipe accordingly.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaintcheck: remove 'sc_old_includes_vars' check
Stefano Lattarini [Sat, 12 Jan 2013 16:04:08 +0000 (17:04 +0100)] 
maintcheck: remove 'sc_old_includes_vars' check

Now even Automake master explicitly reject uses of the INCLUDES
variable, so that check had become obsolete.  In addition, it
was also causing some false positives.

* maintainer/syntax-checks.mk (sc_old_includes_vars): Remove.
(syntax_check_rules): Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: remove some more uses of the AM_PROG_CC_C_O obsolete macro
Stefano Lattarini [Sat, 12 Jan 2013 15:40:42 +0000 (16:40 +0100)] 
tests: remove some more uses of the AM_PROG_CC_C_O obsolete macro

This is a follow-up to 'maint' commit v1.13.1-64-g1e44f85, but for
usages that are only in the 'ng/master' branch and couldn't thus be
modified by that commit.

* t/ax/depcomp-shuffle.sh, t/cscope.tap, t/depcomp-recover.sh,
t/libtool3.sh, t/parallel-tests-suffix-prog.sh, t/subobj-c.sh,
t/subobj-libtool.sh, t/subpkg-yacc.sh, t/subpkg.sh,
t/yacc-subobj-nodep.sh: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: t/ccnoco4.sh is passing now
Stefano Lattarini [Sat, 12 Jan 2013 15:34:51 +0000 (16:34 +0100)] 
tests: t/ccnoco4.sh is passing now

* Makefile.am (XFAIL_TESTS): So Don't list it here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests on warnings: fix post-merge spurious failure
Stefano Lattarini [Sat, 12 Jan 2013 15:09:52 +0000 (16:09 +0100)] 
tests on warnings: fix post-merge spurious failure

* t/warnopts.sh.sh: Adjust to reflect the fact that subdir sources no
longer require AM_PROG_CC_C_O in 'configure.ac'.  Instead, use the
fact that the 'aux' directory name is diagnosed as being reserved on
Windows.
* t/warnings-override.sh: Likewise.
* t/warnings-precedence.sh: Likewise.
* t/warnings-strictness-interactions.sh: Likewise.
* t/warnings-win-over-strictness.sh: Likewise.
* t/warning-groups-win-over-strictness.sh: Adjust to reflect the fact
that subdir sources no longer require AM_PROG_CC_C_O in 'configure.ac'.
Instead, use the fact that AUTOMAKE_OPTIONS cannot hold conditional
content.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: amopts-variable-expansion.sh: fix post-merge spurious failure
Stefano Lattarini [Sat, 12 Jan 2013 14:12:35 +0000 (15:12 +0100)] 
tests: amopts-variable-expansion.sh: fix post-merge spurious failure

* t/amopts-variable-expansion.sh:: Adjust to reflect the fact that subdir
sources no longer require AM_PROG_CC_C_O in 'configure.ac'.  Instead, use
the fact that 'AM_PROG_AR' is required to be in 'configure.ac' when a
library is to be built and warnings in the 'extra-portability' category
are enabled.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: extra-portability.sh: fix post-merge spurious failure
Stefano Lattarini [Sat, 12 Jan 2013 13:59:49 +0000 (14:59 +0100)] 
tests: extra-portability.sh: fix post-merge spurious failure

* t/extra-portability.sh: Adjust to reflect the fact that Automake-NG
supports non-POSIX make variable names like 'foo--bar'.  Instead, use
the fact that the 'aux' directory name is diagnosed as being reserved
on Windows.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: subobj-libtool.sh: fix post-merge spurious failure
Stefano Lattarini [Sat, 12 Jan 2013 13:46:51 +0000 (14:46 +0100)] 
tests: subobj-libtool.sh: fix post-merge spurious failure

* t/subobj-libtool.sh: Remove the 'compile' script automatically brought
in by 'test-init.sh', so that we can ensure "automake --add-missing"
correctly installs it.  While at it, make grepping of automake output
slightly stricter.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: self-check-dir.tap: fix post-merge spurious failure
Stefano Lattarini [Sat, 12 Jan 2013 13:42:52 +0000 (14:42 +0100)] 
tests: self-check-dir.tap: fix post-merge spurious failure

* t/self-check-dir.tap: Here, caused by recent reshuffling of the
Automake source tree.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: subobj-c.sh: fix post-merge spurious failure
Stefano Lattarini [Sat, 12 Jan 2013 13:41:18 +0000 (14:41 +0100)] 
tests: subobj-c.sh: fix post-merge spurious failure

* t/subobj-c.sh: Remove the 'compile' script automatically brought in by
'test-init.sh', so that we can ensure "automake --add-missing" correctly
installs it.  While at it, make grepping of automake output slightly
stricter.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: subobj-cxx.sh: fix post-merge spurious failure
Stefano Lattarini [Sat, 12 Jan 2013 13:35:05 +0000 (14:35 +0100)] 
tests: subobj-cxx.sh: fix post-merge spurious failure

* t/subobj-cxx.sh: Don't check that the auxiliary script 'compile' is
not installed.   Apparently, it is now brought in by AM_PROG_AR.  No
big deal anyway, as a no-strictly-needed distributed auxiliary script
is not going to do any bad.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: subpkg-yacc.sh: start with a clean directory
Stefano Lattarini [Sat, 12 Jan 2013 13:28:21 +0000 (14:28 +0100)] 
tests: subpkg-yacc.sh: start with a clean directory

* t/subpkg-yacc.sh ($am_create_testdir): Define to "empty".

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: subpkg-yacc.sh: fix post-merge spurious failure
Stefano Lattarini [Sat, 12 Jan 2013 13:22:26 +0000 (14:22 +0100)] 
tests: subpkg-yacc.sh: fix post-merge spurious failure

* t/subpkg-yacc.sh: Expect the 'compile' script to be immediately
installed by "automake --add-missing", due to the presence of
AC_PROG_CC in top-level 'configure.ac'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Sat, 12 Jan 2013 13:16:04 +0000 (14:16 +0100)] 
Merge branch 'master' into ng/master

This merge breaks few tests.  They will be adjusted by follow-up patches.

* master: (26 commits)
  tests: remove most uses of the AM_PROG_CC_C_O obsolete macro
  coverage: obsolete macro AM_PROG_CC_C_O should cause no warning nor errors
  INSTALL: update copyright years
  ithreads: use runtime (not configure time) detection of perl threads
  copyright: add few missing copyright notices
  maint: files in PLANS are to be exempted from copyright notice
  maint: consistently honor the UPDATE_COPYRIGHT_YEAR environment variable
  copyright: update some copyright years
  compile: use 'compile' script when "-c -o" is used with losing compilers
  HACKING: suggest more checks before releasing
  tests: can fake a compiler not grasping "-c -o" -- globally in all tests
  sync: update files from upstream with "make fetch"
  typofix: in comments in GNUmakefile
  Rename 'maint/' -> 'maintainer/', for Git's sake
  HACKING: minor typofix
  HACKING: bug-tracker, the PLANS directory, and how to plan "big" changes
  HACKING: rewindable branches should live in the 'experimental/*' namespace
  HACKING: fixlets about git branch rewinding policy
  HACKING: commit messages are not to follow GCS ChangeLog rules too strongly
  HACKING: "detailed explanation" in commit messages is almost mandatory
  ...

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Sat, 12 Jan 2013 12:54:43 +0000 (13:54 +0100)] 
Merge branch 'maint'

* maint:
  tests: remove most uses of the AM_PROG_CC_C_O obsolete macro
  coverage: obsolete macro AM_PROG_CC_C_O should cause no warning nor errors
  INSTALL: update copyright years
  ithreads: use runtime (not configure time) detection of perl threads
  copyright: add few missing copyright notices
  maint: files in PLANS are to be exempted from copyright notice
  maint: consistently honor the UPDATE_COPYRIGHT_YEAR environment variable
  copyright: update some copyright years

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: remove most uses of the AM_PROG_CC_C_O obsolete macro
Stefano Lattarini [Sat, 12 Jan 2013 11:53:21 +0000 (12:53 +0100)] 
tests: remove most uses of the AM_PROG_CC_C_O obsolete macro

Our NEWS file says its use will no longer be required in Automake
1.13, so better make sure that is actually the case.

* Several tests: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agocoverage: obsolete macro AM_PROG_CC_C_O should cause no warning nor errors
Stefano Lattarini [Sat, 12 Jan 2013 11:30:15 +0000 (12:30 +0100)] 
coverage: obsolete macro AM_PROG_CC_C_O should cause no warning nor errors

Suggested by Eric Blake.

* t/am-prog-cc-c-o.sh: New test.
* t/list-of-tests.mk: Add it.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoINSTALL: update copyright years
Stefano Lattarini [Sat, 12 Jan 2013 11:10:39 +0000 (12:10 +0100)] 
INSTALL: update copyright years

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoithreads: use runtime (not configure time) detection of perl threads
Mike Frysinger [Sat, 12 Jan 2013 05:19:40 +0000 (00:19 -0500)] 
ithreads: use runtime (not configure time) detection of perl threads

I can't imagine the runtime checks being a big runtime penalty, so there
shouldn't be a need to do the checks at configure check and hardcode the
result in the generated automake.

With the current system, it means if you change your perl config (build
perl w/threads, build automake, build perl w/out threads), or deploy a
compiled automake package on a different system (build had threads, but
deployed system does not), you get errors when trying to run automake.

So take the logic from configure.ac and move it to the one place where
PERL_THREADS is used (lib/Automake/Config.in) and do the version/config
checking at runtime.

* bootstrap.sh (PERL_THREADS): Delete assignment and use in sed.
* configure.ac (am_cv_prog_PERL_ithreads, PERL_THREADS): Delete all code
related to these two variables.
* lib/Automake/Config.in (perl_threads): Initialize to 0, and only set to
1 if the perl version is at least 5.007_002, and useithreads is in Config.

Copyright-paperwork-exempt: yes
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>