]> git.ipfire.org Git - thirdparty/automake.git/log
thirdparty/automake.git
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Wed, 7 Nov 2012 21:18:31 +0000 (22:18 +0100)] 
Merge branch 'master' into ng/master

* master:
  tests: enhance coverage on silent-rules and C compilation rules a little
  tests: new variable $am_testaux_builddir
  tests: rename $am_testauxdir -> $am_testaux_srcdir

12 years agotests: enhance coverage on silent-rules and C compilation rules a little
Stefano Lattarini [Wed, 7 Nov 2012 21:08:35 +0000 (22:08 +0100)] 
tests: enhance coverage on silent-rules and C compilation rules a little

* t/silent-c-generic.sh: Here, by trying them also with automatic
dependency tracking explicitly disabled.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Wed, 7 Nov 2012 20:51:01 +0000 (21:51 +0100)] 
Merge branch 'maint'

* maint:
  tests: new variable $am_testaux_builddir
  tests: rename $am_testauxdir -> $am_testaux_srcdir

12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Wed, 7 Nov 2012 20:39:04 +0000 (21:39 +0100)] 
Merge branch 'master' into ng/master

* master:
  tests: rename few tests (on silent-rules support)
  tests: merge two tests on silent-rules with libtool
  vala tests: source test-init.sh, not ./defs
  tests: fix a spurious typo-related failure
  tests: remove spurious leftover use of 'Exit'
  tests: can check our recipes avoid trailing backslashes
  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

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: rename few tests (on silent-rules support)
Stefano Lattarini [Wed, 7 Nov 2012 19:39:19 +0000 (20:39 +0100)] 
tests: rename few tests (on silent-rules support)

Either to more informative names, or to names more consistent with the
ones of similar/related tests.

* t/silent.sh: Rename ...
* t/silent-c-generic.sh: ... like this, and adjust heading comments.
* t/silent2.sh: Rename ...
* t/silent-c-gcc.sh: ... like this, and adjust heading comments.
* t/silent3.sh: Rename ...
* t/silent-lt-generic.sh: ... like this, and adjust heading comments.
* t/silent4.sh: Rename ...
* t/silent-lt-gcc.sh: ... like this, and adjust heading comments.
* t/silentcxx.sh: Rename ...
* t/silent-cxx-generic.sh: ... like this, and adjust heading comments.
* t/silentcxx-gcc.sh: Rename ...
* t/silent-cxx-gcc.sh: ... like this, and adjust heading comments.
* t/silentf77.sh: Rename ...
* t/silent-f77.sh: ... like this, and adjust heading comments.
* t/silentf90.sh: Rename ...
* t/silent-f90.sh: ... like this, and adjust heading comments.
* t/silent7.sh: Rename ...
* t/silent-gen.sh: ... like this, and adjust heading comments.
* t/silent6.sh: Rename ...
* t/silent-custom.sh: ... like this.
* t/silent8.sh: Rename ...
* t/silent-texi.sh: ... like this.
* t/list-of-tests.mk: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: merge two tests on silent-rules with libtool
Stefano Lattarini [Wed, 7 Nov 2012 18:56:24 +0000 (19:56 +0100)] 
tests: merge two tests on silent-rules with libtool

This helps to reduce code duplication, and also to (marginally)
speed up the involved tests.

Before this change, we had:

  $ diff -u t/silent3.sh t/silent9.sh

  --- t/silent3.sh      2012-11-07 19:38:05.000000000 +0100
  +++ t/silent9.sh      2012-11-07 19:27:54.000000000 +0100
  @@ -14,9 +14,9 @@
   # You should have received a copy of the GNU General Public License
   # along with this program.  If not, see <http://www.gnu.org/licenses/>.

  -# Check silent-rules mode, with libtool, standard depmode case.
  +# Check silent-rules mode, with libtool, nodep case.

  -# Please keep this file in sync with 'silent4.sh' and 'silent9.sh'.
  +# Please keep this file in sync with 'silent3.sh' and 'silent4.sh'.

   required='cc libtoolize'
   . test-init.sh
  @@ -26,8 +26,8 @@
   cat >>configure.ac <<'EOF'
   AC_CONFIG_FILES([sub/Makefile])
   AC_PROG_CC
  -AM_PROG_AR
   AM_PROG_CC_C_O
  +AM_PROG_AR
   AC_PROG_LIBTOOL
   AC_OUTPUT
   EOF
  @@ -61,7 +61,7 @@
   $AUTOMAKE --add-missing
   $AUTOCONF

  -./configure --enable-silent-rules
  +./configure --disable-dependency-tracking --enable-silent-rules
   $MAKE >stdout || { cat stdout; exit 1; }
   cat stdout
   $EGREP ' (-c|-o)' stdout && exit 1

* t/silent9.sh: Remove, merge ...
* t/silent3.sh: ... in here.
* t/list-of-tests.mk: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 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>
12 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>
12 years agoMerge branch 'maint'
Stefano Lattarini [Wed, 31 Oct 2012 11:41:13 +0000 (12:41 +0100)] 
Merge branch 'maint'

* maint:
  vala tests: source test-init.sh, not ./defs
  tests: fix a spurious typo-related failure
  tests: remove spurious leftover use of 'Exit'
  tests: can check our recipes avoid trailing backslashes
  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

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 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>
12 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>
12 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

12 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>
12 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>
12 years agotests: fixup one test after botched merge
Stefano Lattarini [Sat, 27 Oct 2012 18:56:23 +0000 (20:56 +0200)] 
tests: fixup one test after botched merge

* t/recurs-user-phony.sh: This one.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Sat, 27 Oct 2012 18:26:02 +0000 (20:26 +0200)] 
Merge branch 'master' into ng/master

* master:
  configure: correctly identify missing GNU compilers as such
  tests: get rid of ./defs, it's no longer used.
  maintcheck: fix the name of a check
  maintcheck: guard against uses of ./defs in tests

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Sat, 27 Oct 2012 17:18:48 +0000 (19:18 +0200)] 
Merge branch 'maint'

* maint:
  configure: correctly identify missing GNU compilers as such

12 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>
12 years agotests: get rid of ./defs, it's no longer used.
Stefano Lattarini [Sat, 27 Oct 2012 16:31:21 +0000 (18:31 +0200)] 
tests: get rid of ./defs, it's no longer used.

* defs: Delete.
* configure.ac (AC_CONFIG_LINKS): No longer link it.
* t/ax/tap-setup.sh: Don't look for a file named 'defs' in
the grandparent directory of the current test directory to
decide whether we're running in the correct directory.
* syntax-check.mk (xdefs): Remove '$(srcdir)/defs'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaintcheck: fix the name of a check
Stefano Lattarini [Sat, 27 Oct 2012 16:26:19 +0000 (18:26 +0200)] 
maintcheck: fix the name of a check

* (sc_tests_Exit_not_exit): Rename ...
(sc_tests_exit_not_Exit): ... like this, which is more faithful
to what the check actually does.  Adjust a grammaro in comments
while at it.
(syntax_check_rules): Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: prefer including 'test-init.sh' rather than './defs'
Stefano Lattarini [Sat, 27 Oct 2012 16:22:58 +0000 (18:22 +0200)] 
tests: prefer including 'test-init.sh' rather than './defs'

This is a follow-up to today's same-name commit v1.12.4-181-g5ddf100,
which did the same for the test cases in master.

* All tests: To run the common setup, use the command:

    . test-init.sh

instead of the older, "historical" one:

    . ./defs || exit 1

Note that the "|| exit 1" wasn't really useful, since the 'errexit'
shell flag is in effect in both './defs' and 'test-init.sh', and all
the known shells that are good enough to run the automake testsuite
do automatically exit with error when a sourced file cannot be found
(at least, they do so in non-interactive mode, which is the only
mode that concerns us in the testsuite).

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: fix buglets and weaknesses in a test
Stefano Lattarini [Sat, 27 Oct 2012 16:19:23 +0000 (18:19 +0200)] 
tests: fix buglets and weaknesses in a test

* t/nostdinc.sh: Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: fix a spurious grepping failure
Stefano Lattarini [Sat, 27 Oct 2012 16:16:34 +0000 (18:16 +0200)] 
tests: fix a spurious grepping failure

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

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaintcheck: guard against uses of ./defs in tests
Stefano Lattarini [Sat, 27 Oct 2012 16:08:06 +0000 (18:08 +0200)] 
maintcheck: guard against uses of ./defs in tests

Now, 'test-init.sh' should be used instead.

* (sc_tests_no_source_defs): New maintainer check.
(syntax_check_rules): Add it.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Sat, 27 Oct 2012 15:52:35 +0000 (17:52 +0200)] 
Merge branch 'master' into ng/master

* master:
  tests: remove spurious leftover use of 'Exit'
  tests: remove an obsolete, and probably now wrong, comment
  tests: remove obsolescent references to './defs'
  tests: prefer including 'test-init.sh' rather than './defs'

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: remove spurious leftover use of 'Exit'
Stefano Lattarini [Sat, 27 Oct 2012 15:34:50 +0000 (17:34 +0200)] 
tests: remove spurious leftover use of 'Exit'

* t/per-target-flags.sh: Here, and simply use 'exit' instead.
Issue revealed by the 'sc_tests_Exit_not_exit' maintainer check.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: remove an obsolete, and probably now wrong, comment
Stefano Lattarini [Sat, 27 Oct 2012 15:09:55 +0000 (17:09 +0200)] 
tests: remove an obsolete, and probably now wrong, comment

* t/dirlist.sh: Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: remove obsolescent references to './defs'
Stefano Lattarini [Sat, 27 Oct 2012 15:08:28 +0000 (17:08 +0200)] 
tests: remove obsolescent references to './defs'

* t/distcom-subdir.sh, t/distcom2.sh, t/ax/depcomp.sh, t/conff2.sh,
t/ccnoco3.sh, t/ccnoco.sh, t/self-check-dir.tap, t/self-check-exit.tap,
t/self-check-me.tap: Here.  Instead, refer to "am-test-lib.sh",
"test-init.sh", or simply "the testsuite setup", as appropriate.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: prefer including 'test-init.sh' rather than './defs'
Stefano Lattarini [Sat, 27 Oct 2012 14:41:39 +0000 (16:41 +0200)] 
tests: prefer including 'test-init.sh' rather than './defs'

This is a follow-up to today's commit v1.12.4-22-g0610fc8,
"tests: prepare to move ./defs to t/ax/test-init.sh"

* All tests: To run the common setup, use the command:

    . test-init.sh

instead of the older, "historical" one:

    . ./defs || exit 1

Note that the "|| exit 1" wasn't really useful, since the 'errexit'
shell flag is in effect in both './defs' and 'test-init.sh', and all
the known shells that are good enough to run the automake testsuite
do automatically exit with error when a sourced file cannot be found
(at least, they do so in non-interactive mode, which is the only
mode that concerns us in the testsuite).

* t/ax/tap-summary-aux.sh, t/ax/testsuite-summary-checks.sh: Likewise.

* gen-testsuite-part: Do the same in the generated tests.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Sat, 27 Oct 2012 14:31:35 +0000 (16:31 +0200)] 
Merge branch 'master' into ng/master

* master:
  tests: merge, tweak and modernize few test scripts
  tests: move coverage about BUILT_SOURCES
  tests: more meaningful names for some test cases
  tests: merge some grepping tests on Yacc support

+ Extra non-trivial changes:

* t/per-target-flags.sh: Sync with the back-ported version that
is in maint and master, that has several bugfixes over the previous
version in ng/master.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Sat, 27 Oct 2012 14:15:04 +0000 (16:15 +0200)] 
Merge branch 'maint'

* maint:
  tests: merge, tweak and modernize few test scripts
  tests: move coverage about BUILT_SOURCES
  tests: more meaningful names for some test cases
  tests: merge some grepping tests on Yacc support

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 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>
12 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>
12 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>
12 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>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Sat, 27 Oct 2012 12:29:19 +0000 (14:29 +0200)] 
Merge branch 'master' into ng/master

* master:
  tests: prepare to move ./defs to t/ax/test-init.sh

12 years agoMerge branch 'maint'
Stefano Lattarini [Sat, 27 Oct 2012 12:23:40 +0000 (14:23 +0200)] 
Merge branch 'maint'

* maint:
  tests: prepare to move ./defs to t/ax/test-init.sh

12 years agoMerge branch 'am-prog-mkdir-p-remove' into ng/master
Stefano Lattarini [Sat, 27 Oct 2012 12:15:05 +0000 (14:15 +0200)] 
Merge branch 'am-prog-mkdir-p-remove' into ng/master

Since we had to restate AM_PROG_MKDIR_P in master before the 1.13
release, we don't merge master directly in ng/master, to avoid spurious
merge conflicts (since AM_PROG_MKDIR_P should remain obsolete and
removed in Automake-NG).

We have thus create a temporary branch 'am-prog-mkdir-p-remove', based
off of master, which reverts the commit 'v1.12.4-158-gdf23daf', which
reinstated AM_PROG_MKDIR_P, and are merging that branch in 'ng/master'.

Once 1.13 is out and master becomes the starting point of Automake 1.14,
we'll merge the 'am-prog-mkdir-p-remove' branch back into master as well,
since we plan to remove AM_PROG_MKDIR_P once and for all in Automake 1.14.

* am-prog-mkdir-p-remove:
  AM_PROG_MKDIR_P: remove as obsolete, this time for good
  depcomp: avoid potential interferences from the environment
  depcomp: improve comments about the 'gcc' depmode
  compat: reinstate AM_PROG_MKDIR_P, for gettext

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoAM_PROG_MKDIR_P: remove as obsolete, this time for good
Stefano Lattarini [Fri, 26 Oct 2012 12:00:35 +0000 (14:00 +0200)] 
AM_PROG_MKDIR_P: remove as obsolete, this time for good

This commit basically reverts v1.12.4-158-gdf23daf, re-instating
commit v1.12-20-g8a1c64f.

Support for the obsolescent 'AM_PROG_MKDIR_P' m4 macro has been
deprecated in the documentation and with runtime warnings since
Automake 1.12.1.  Still, when we released Automake 1.13, we had
to delay that macro's removal, since at the time the last released
version of GNU gettext still AC_REQUIRE's AM_PROG_MKDIR_P via its
'intl.m4' and 'po.m4' files, which are pulled into *many* projects.

But it's now time to remove AM_PROG_MKDIR_P once and for all.
Projects still needing to work with older gettext releases will
be able to do so by adding a definition like

   AC_DEFUN([AM_PROG_MKDIR_P], [AC_PROG_MKDIR_P([$@])])

to their 'acinclude.m4' file or to another local '*.m4' file.

* m4/mkdirp.m4: Delete.
* Makefile.am (dist_automake_ac_DATA): Remove it.
* automake.in (scan_autoconf_traces): Don't handle, nor warn about,
AM_PROG_MKDIR_P.
* doc/automake.texi (Obsolete Macros): Delete (it only spoke about
AM_PROG_MKDIR_P).
* t/gettext-macros.sh: Adjust.
* t/mkdirp-deprecation.sh: Delete.
* t/list-of-tests.mk: Don't list it.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: don't explicitly check whether $MAKE is GNU make
Stefano Lattarini [Sat, 27 Oct 2012 11:25:44 +0000 (13:25 +0200)] 
tests: don't explicitly check whether $MAKE is GNU make

* t/autohdr-subdir-pr12495.sh : Here.  Issue revealed by the
maintainer check 'sc_tests_no_gmake_checking'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 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>
12 years agoMerge branch 'maint'
Stefano Lattarini [Sat, 27 Oct 2012 09:57:43 +0000 (11:57 +0200)] 
Merge branch 'maint'

* maint:
  depcomp: avoid potential interferences from the environment
  depcomp: improve comments about the 'gcc' depmode
  sync: update files from upstream with "make fetch"
  maintcheck: remove an obsolescent check
  tests: rename some tests to more expressive names, again
  tests: remove an obsolescent grepping check
  tests: merge two tests on automatic remake functionality
  tests: rename some test to more expressive names
  news: 'compile' supports libfoo.a naming when wrapping Microsoft tools
  tests: ensure generation of wrapper tests matching multiple conditions
  tests: simplify a loop in gen-testsuite-part
  compile: support libfoo.a naming when wrapping Microsoft tools
  NEWS: fix wording and grammaros, re-wrap text accordingly
  cosmetics: fix typo in 'lib/depcomp' comments

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 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>
12 years agoMerge branch 'maint' into ng/master
Stefano Lattarini [Sat, 27 Oct 2012 08:57:57 +0000 (10:57 +0200)] 
Merge branch 'maint' into ng/master

* maint:
  sync: update files from upstream with "make fetch"
  maintcheck: remove an obsolescent check
  tests: rename some tests to more expressive names, again
  tests: remove an obsolescent grepping check
  tests: merge two tests on automatic remake functionality
  tests: rename some test to more expressive names
  news: 'compile' supports libfoo.a naming when wrapping Microsoft tools
  tests: ensure generation of wrapper tests matching multiple conditions
  tests: simplify a loop in gen-testsuite-part
  compile: support libfoo.a naming when wrapping Microsoft tools
  NEWS: fix wording and grammaros, re-wrap text accordingly
  cosmetics: fix typo in 'lib/depcomp' comments

+ Extra non-trivial changes:

* Makefile.am (XFAIL_TESTS): Rename 't/pr8365-remake-timing.sh' to
't/remake-timing-bug-pr8365.sh' (in master, this was done for in
file 't/list-of-tests.mk', but that is gone in ng/master).
* t/parallel-tests-empty-tests.sh: Merge ...
* t/parallel-tests-empty.sh: ... into this, to reduce confusion and
code duplication.
* t/remake-maintainer-mode.sh: Delete: Automake-NG don't support
AM_MAINTAINER_MODE (see commit v1.12.2-790-g00a3837).

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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

12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 years agocompat: reinstate AM_PROG_MKDIR_P, for gettext
Jim Meyering [Mon, 22 Oct 2012 14:14:49 +0000 (16:14 +0200)] 
compat: reinstate AM_PROG_MKDIR_P, for gettext

Do not remove AM_PROG_MKDIR_P just yet.

gettext (latest from git) still AC_REQUIRE's AM_PROG_MKDIR_P via its
intl.m4 and po.m4 files, which are pulled into *many* projects.

When I try to build one of those projects (coreutils) using the latest
from automake.git/master, I see this failure:

    $ aclocal -I m4
    configure.ac:477: warning: AM_PROG_MKDIR_P is m4_require'd \
      but not m4_defun'd
    m4/po.m4:23: AM_PO_SUBDIRS is expanded from...
    m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
    configure.ac:477: the top level

That is because AM_PROG_MKDIR_P was removed (via commit
v1.12-20-g8a1c64f) in preparation for the next release of automake.

* NEWS: Remove the paragraph that announced the removal of
AM_PROG_MKDIR_P.
* Makefile.am (dist_automake_ac_DATA): Add m4/mkdirp.m4.
* m4/mkdirp.m4: Re-add file.
* t/mkdirp-deprecation.sh: Likewise.
* t/list-of-tests.mk: Add it.
* automake.in: Restore removed code, and adjust comments, s/1.13/1.14/
to reflect new plan for removal.
* doc/automake.texi (Obsolete Macros): Restore the section, but
now with only one entry: the one for AM_PROG_MKDIR_P.

12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Wed, 3 Oct 2012 11:07:17 +0000 (13:07 +0200)] 
Merge branch 'master' into ng/master

* master:
  config headers: remove stale comment in makefile fragment
  NEWS: wording and quoting fixlets in few older entries
  config headers: don't emit rules for headers not generated by autoheader
  docs: fix minor typo: s/expending/expanding/
  sync: update files from upstream with "make fetch"
  maint: post-release minor version bump
  maint: typo fixes s/lies into/lies in/
  release: stable release 1.12.4
  NEWS: minor fix

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agodry run: use $(MFLAGS), not $(MAKEFLAGS), to determine whether running dry
Stefano Lattarini [Tue, 2 Oct 2012 22:03:10 +0000 (00:03 +0200)] 
dry run: use $(MFLAGS), not $(MAKEFLAGS), to determine whether running dry

$(MFLAGS) does not containing the command line variable definitions, and
it always begins with a hyphen unless it is empty (MAKEFLAGS begins with
a hyphen only when it begins with an option that has no single-letter
version, such as '--warn-undefined-variables').  This allows use to make
stricter assumptions on its content, thus simplifying the implementation
of ...

* lib/am/header-vars.am (am__make_dryrun): ... this macro.
* t/make-dryrun.tap: Simplify accordingly.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agodry run: improve coverage on $(am.make.dry-run)
Stefano Lattarini [Tue, 2 Oct 2012 21:10:19 +0000 (23:10 +0200)] 
dry run: improve coverage on $(am.make.dry-run)

* t/make-dryrun.tap: Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Tue, 2 Oct 2012 18:34:47 +0000 (20:34 +0200)] 
Merge branch 'maint'

* maint:
  config headers: remove stale comment in makefile fragment
  NEWS: wording and quoting fixlets in few older entries
  config headers: don't emit rules for headers not generated by autoheader
  docs: fix minor typo: s/expending/expanding/
  sync: update files from upstream with "make fetch"
  maint: post-release minor version bump
  maint: typo fixes s/lies into/lies in/
  release: stable release 1.12.4
  NEWS: minor fix

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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/

12 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>
12 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>
12 years agofixup: few minor typofixes in comments
Stefano Lattarini [Sun, 16 Sep 2012 07:52:02 +0000 (09:52 +0200)] 
fixup: few minor typofixes in comments

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: fix spurious failure in test on TAGS support
Stefano Lattarini [Sun, 16 Sep 2012 07:47:19 +0000 (09:47 +0200)] 
tests: fix spurious failure in test on TAGS support

* t/tags-pr12372.sh (Makefile.am): Use pattern rules rather than
old-fashioned suffix rules.
(sub/Makefile.am): Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: warnings in the 'obsolete' category: fix spurious failure
Stefano Lattarini [Sun, 16 Sep 2012 07:40:46 +0000 (09:40 +0200)] 
tests: warnings in the 'obsolete' category: fix spurious failure

* t/warnings-obsolete-default.sh: $(INCLUDES) is no longer supported
in any way by Automake-NG, to a point that its definition will just
be ignored, but cause no warning; so, instead, use the two-argument
invocation form of AM_INIT_AUTOMAKE to elicit warnings in the 'obsolete'
category.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Sun, 16 Sep 2012 07:10:46 +0000 (09:10 +0200)] 
Merge branch 'master' into ng/master

* master:
  fix typos in mk-dirp.m4
  tags: automake bug bug#12372 is fixed
  coverage: better exposure for automake bug#12372 (tags-related)
  coverage: expose automake bug#12372 (tags-related)
  sync: update files from upstream with "make fetch"
  news: cygnus will be removed in automake 1.13
  news: some changes for 1.13 has been "de-planned"
  news: report that the have seen fixlets after 1.12.3
  warns: enable category 'obsolete' by default

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agofix typos in mk-dirp.m4
Jim Meyering [Wed, 12 Sep 2012 15:31:24 +0000 (17:31 +0200)] 
fix typos in mk-dirp.m4

* t/gettext-macros.sh: Fix typo in name of macro emitted into
mk-dirp.m4: s/AM_MKDIR_P/AM_PROG_MKDIR_P/,
and as Stefano Lattarini noted, also fix this typo:
s/AC_MKDIR_P/AC_PROG_MKDIR_P/.

12 years agobuilt sources: avoid fork bomb in $(BUILT_SOURCES) handling
Stefano Lattarini [Mon, 10 Sep 2012 15:36:38 +0000 (17:36 +0200)] 
built sources: avoid fork bomb in $(BUILT_SOURCES) handling

Due to how the handling of $(BUILT_SOURCES) was implemented in Automake-NG,
a recursive make call in the recipe of any $(BUILT_SOURCES) (or of any of
its prerequisites) would have caused an infinite recursion (complete with
fork bomb, yuck).  Work around the issue.

See:
<http://lists.gnu.org/archive/html/help-smalltalk/2012-08/msg00027.html>
<http://lists.gnu.org/archive/html/automake-patches/2012-08/msg00052.html>

* lib/am/common-targets.mk: Here, with the help of ...
(am.hack.making-built-sources): ... this new internal variable.
* Makefile.am (XFAIL_TESTS): Remove 't/built-sources-fork-bomb.sh'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agocoverage: expose fork bomb in $(BUILT_SOURCES) handling
Stefano Lattarini [Mon, 10 Sep 2012 11:47:44 +0000 (13:47 +0200)] 
coverage: expose fork bomb in $(BUILT_SOURCES) handling

Due to how the handling of $(BUILT_SOURCES) is implemented in Automake-NG,
a recursive make call in the recipe of any $(BUILT_SOURCES) (or of any of
its prerequisites) will cause an infinite recursion (complete with fork
bomb, yuck).  Expose the issue in a test case (still failing, of course).

See:
<http://lists.gnu.org/archive/html/help-smalltalk/2012-08/msg00027.html>
<http://lists.gnu.org/archive/html/automake-patches/2012-08/msg00052.html>

* t/built-sources-fork-bomb.sh: New test.
* Makefile.am (XFAIL_TESTS): Add it.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotags: automake bug bug#12372 is fixed
Stefano Lattarini [Tue, 11 Sep 2012 09:31:20 +0000 (11:31 +0200)] 
tags: automake bug bug#12372 is fixed

It has been fixed as a side effect of the overhauling of tags support.

* t/list-of-tests.mk (XFAIL_TESTS): No longer list 'tags-pr12372.sh'.
* NEWS: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Tue, 11 Sep 2012 09:24:51 +0000 (11:24 +0200)] 
Merge branch 'maint'

* maint:
  coverage: better exposure for automake bug#12372 (tags-related)
  coverage: expose automake bug#12372 (tags-related)

12 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>
12 years agoconfig headers: avoid extra make recursion
Stefano Lattarini [Tue, 11 Sep 2012 08:29:35 +0000 (10:29 +0200)] 
config headers: avoid extra make recursion

* lib/am/remake-hdr.am (%CONFIG_H%). By rewriting its recipe to
duplicate the '%STAMP%' recipe a little.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agocosmetics: remove stray copyright notice excerpt
Stefano Lattarini [Mon, 10 Sep 2012 10:57:47 +0000 (12:57 +0200)] 
cosmetics: remove stray copyright notice excerpt

* lib/am/common-targets.mk: Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 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>
12 years agoMerge branch 'maint'
Stefano Lattarini [Wed, 5 Sep 2012 12:40:52 +0000 (14:40 +0200)] 
Merge branch 'maint'

* maint:
  sync: update files from upstream with "make fetch"
  news: cygnus will be removed in automake 1.13
  news: some changes for 1.13 has been "de-planned"
  news: report that the have seen fixlets after 1.12.3
  warns: enable category 'obsolete' by default

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 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>
12 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>
12 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>
12 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>
12 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>
12 years agomaintcheck: fix some minor failures
Stefano Lattarini [Tue, 28 Aug 2012 09:58:59 +0000 (11:58 +0200)] 
maintcheck: fix some minor failures

* t/lisp-flags.sh: Avoid use of brittle "make -e".
* Makefile.am (perf): Don't use $(AM_MAKEFLAGS) when invoking make
recursively.
* t/dist-obsolete-opts.sh: Make executable.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: fix spurious failure in test on Flex headers
Stefano Lattarini [Tue, 28 Aug 2012 09:52:45 +0000 (11:52 +0200)] 
tests: fix spurious failure in test on Flex headers

* t/lex-headers.sh: Don't use 'yl_distcheck', simply call "make distcheck"
instead, as GNU make cannot suffer of the FreeBSD bug 'yl_distcheck' was
meant to guard against.
(Makefile.am): Don't use $(AM_MAKEFLAGS) when invoking make recursively.
This avoids a maintainer-check failure.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>