Re: [PATCHES] Two small improvements to HACKING

2010-08-19 Thread Stefano Lattarini
On Thursday 19 August 2010, Ralf Wildenhues wrote: * Stefano Lattarini wrote on Thu, Aug 19, 2010 at 12:09:15AM CEST: HACKING: improve description of git bugfix branches. HACKING: acknowledge Perl 4 as utterly obsolete. Nits below. Subject: [PATCH 1/2] HACKING: improve description

[PATCH 0/6] Add support for non-default autotools in rebuild rules.

2010-08-19 Thread Stefano Lattarini
Hello automakers. Here is the (hopefully) final patch series providing a more correct and consistent overriding of autoconf and autom4te at configure-time (for use in automake-generated rebuild rules). This is what the individual patches do, in detail: 1. Add a tests (`remake0.test') that

[PATCH 3/6] Add tests for non-default autotools in rebuild rules.

2010-08-19 Thread Stefano Lattarini
* configure.ac (am_AUTOM4TE): New AC_SUBST'd variable. * tests/defs.in ($AUTOM4TE): New shell variable, defaulting to AC_SUBST'd `...@am_autom4te@'. ($APIVERSION): New variable, AC_SUBST'd. ($ACLOCAL, $AUTOMAKE): Use it. * tests/remake8a.test: New test. * tests/remake8b.test: Likewise. *

[PATCH 4/6] Improve support for non-default autotools in rebuild rules.

2010-08-19 Thread Stefano Lattarini
* lib/am/configure.am: (%MAKEFILE-IN%): When appropriate, export AUTOCONF and AUTOM4TE to proper values when calling $(AUTOMAKE). (%MAKEFILE-IN%) [%?TOPDIR_P%]: Likewise. ($(ACLOCAL_M4)) [!%?TOPDIR_P%]: Likewise (but when calling $(ACLOCAL). * m4/init.m4: Bumped serial number: 16 - 17.

[PATCH 1/6] Test that aclocal(s) used by the testsuite and by autoconf match.

2010-08-19 Thread Stefano Lattarini
* tests/remake0.test: New test. * tests/Makefile.am (TESTS): Updated. --- ChangeLog |6 ++ tests/Makefile.am |1 + tests/Makefile.in |1 + tests/remake0.test | 38 ++ 4 files changed, 46 insertions(+), 0 deletions(-) create mode

[PATCH 2/6] Testsuite: fix missing*.test for non-default autotools.

2010-08-19 Thread Stefano Lattarini
* tests/missing.test: Build and use our own `autoconf' script, to avoid spurious failures due to configure-time value of $AUTOCONF being an absolute path. Prefer passing overrides to ./configure on the command line rather than in the environment. Some other related and unrelated improvements. *

[PATCH 5/6] Fix tests missing.test and missing2.test.

2010-08-19 Thread Stefano Lattarini
* tests/missing.test, tests/missing2.test: Do not override autoconf in calls to ./configure. Add checks to verify that the `missing' script is called anyway, whenever it's expected to. Move checks involving version number suffixes... * tests/missing7.test: ... to this new tests, and extend them

[PATCH 6/6] Testsuite: improve support for non-default autotools.

2010-08-19 Thread Stefano Lattarini
* tests/defs.in: Fix definition and exporting of $AUTOCONF and $AUTOMAKE to better honour configure-time overrides. This fixes failures of `remake0.test' in setups where autoconf and autom4te are overriden at configure time. --- ChangeLog |6 ++ tests/defs.in | 26

Re: [PATCHES] Two small improvements to HACKING

2010-08-19 Thread Ralf Wildenhues
* Stefano Lattarini wrote on Thu, Aug 19, 2010 at 12:23:47PM CEST: On Thursday 19 August 2010, Ralf Wildenhues wrote: Are you aware that merging fix-foo in maint, branch-1.11, and master is equivalent to merging fix-foo in maint, then merging maint in branch-1.11 and master (under the