]> git.ipfire.org Git - thirdparty/automake.git/log
thirdparty/automake.git
12 years agotests: improve sync between to sister tests
Stefano Lattarini [Mon, 31 Dec 2012 18:04:02 +0000 (19:04 +0100)] 
tests: improve sync between to sister tests

* t/txinfo-many-output-formats.sh: This ...
* t/txinfo-many-output-formats-vpath.sh: ... and this.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: better name for a texinfo test
Stefano Lattarini [Mon, 31 Dec 2012 17:42:32 +0000 (18:42 +0100)] 
tests: better name for a texinfo test

* t/txinfo21b: Rename ...
* t/txinfo-many-output-formats-vpath.sh: ... like this.  This matches
the similar rename "txinfo21" -> "txinfo-many-output-formats" done
for sister test 't/txinfo21.sh' in the master branch (rename that has
already been merged in the 'ng/master' branch.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: update copyright year for 2013 (in branch ng/master)
Stefano Lattarini [Mon, 31 Dec 2012 17:33:00 +0000 (18:33 +0100)] 
maint: update copyright year for 2013 (in branch ng/master)

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Mon, 31 Dec 2012 17:30:40 +0000 (18:30 +0100)] 
Merge branch 'master' into ng/master

* master:
  maint: update copyright year for 2013 (in branch master)
  maint: update copyright year for 2013 (in branch maint)

12 years agomaint: update copyright year for 2013 (in branch master)
Stefano Lattarini [Mon, 31 Dec 2012 17:26:02 +0000 (18:26 +0100)] 
maint: update copyright year for 2013 (in branch master)

* t/includes-no-more.sh: Only here (all other files already touched in maint)

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Mon, 31 Dec 2012 17:24:03 +0000 (18:24 +0100)] 
Merge branch 'maint'

* maint:
  maint: update copyright year for 2013 (in branch maint)

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: update copyright year for 2013 (in branch maint)
Stefano Lattarini [Mon, 31 Dec 2012 17:18:37 +0000 (18:18 +0100)] 
maint: update copyright year for 2013 (in branch maint)

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Mon, 31 Dec 2012 13:58:00 +0000 (14:58 +0100)] 
Merge branch 'master' into ng/master

* master:
  docs: adjust comment w.r.t. recent tests renaming
  tests: some more renames for texinfo tests
  tests: enhance and tweak some texinfo tests
  tests: remove a redundant texinfo test
  tests: don't list a removed tests in XFAIL_TESTS
  tests: more explicative names for some tests
  cleanup: drop a redundant %?FIRST% transform
  maint: state when compatibility cruft should be removed or warned about

+ Non-trivial extra edits

* t/txinfo-other-suffixes.sh: Remove, Automake-NG only supports
'.texi' ad suffix for Texinfo files.
* t/txinfo-without-info-suffix.sh: Remove, Automake-NG doesn't
support generating suffix-less info files.
* t/txinfo-no-repeated-targets.sh: Remove, superseded by test
't/txinfo-rules-once.sh' (see [ng] commit v1.12.1-416-gd5459b9).
* t/txinfo-dvi-recurs.sh: Remove, basically an obsolete grepping
test (as was the test 'txinfo10.sh' this was renamed from; see
[ng] commit v1.12.2-887-gb80d8d2).

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Mon, 31 Dec 2012 13:38:23 +0000 (14:38 +0100)] 
Merge branch 'maint'

* maint:
  docs: adjust comment w.r.t. recent tests renaming
  tests: some more renames for texinfo tests

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agodocs: adjust comment w.r.t. recent tests renaming
Stefano Lattarini [Mon, 31 Dec 2012 13:16:01 +0000 (14:16 +0100)] 
docs: adjust comment w.r.t. recent tests renaming

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: some more renames for texinfo tests
Stefano Lattarini [Mon, 31 Dec 2012 12:57:29 +0000 (13:57 +0100)] 
tests: some more renames for texinfo tests

* t/txinfo.sh: Rename ...
* t/txinfo-tex-dist.sh: ... like this.
* t/txinfo10.sh: Rename ...
* t/txinfo-dvi-recurs.sh: ... like this.
* t/txinfo20.sh: Rename ...
* t/txinfo-makeinfo-error-no-clobber.sh: ... like this.
* t/txinfo-setfilename-suffix-match.sh: Rename ...
* t/txinfo-setfilename-suffix-strip.sh: ... like this.
* t/txinfo-suffix-less-info.sh: Rename ...
* t/txinfo-without-info-suffix.sh: ... like this.
* t/vtexi.sh: Rename ...
* t/txinfo-vtexi.sh: ... like this.
* t/vtexi2.sh: Rename ...
* t/txinfo-vtexi2.sh: ... like this.
* t/vtexi3.sh: Rename ...
* t/txinfo-vtexi3.sh: ... like this, and adjust heading comments.
* t/vtexi4.sh: Rename ...
* t/txinfo-vtexi4.sh: ... like this, and adjust heading comments.
* t/list-of-tests.mk: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Mon, 31 Dec 2012 12:45:05 +0000 (13:45 +0100)] 
Merge branch 'maint'

* maint:
  tests: enhance and tweak some texinfo tests
  tests: remove a redundant texinfo test
  tests: don't list a removed tests in XFAIL_TESTS
  tests: more explicative names for some tests
  cleanup: drop a redundant %?FIRST% transform
  maint: state when compatibility cruft should be removed or warned about

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: enhance and tweak some texinfo tests
Stefano Lattarini [Mon, 31 Dec 2012 12:30:51 +0000 (13:30 +0100)] 
tests: enhance and tweak some texinfo tests

* t/txinfo-subdir-pr343.sh: Move the tests checking that '.info.bak'
files in subdirs are not unduly distributed into ...
* t/txinfo-no-extra-dist.sh: ... in here.  Enhance a little while
at it.
* t/txinfo-other-suffixes.sh: Also check that the '.texinfo' suffix
is accepted and works.
* t/txinfo-setfilename-suffix-match.sh: Remove useless call to
autoconf, enhance a little.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: remove a redundant texinfo test
Stefano Lattarini [Mon, 31 Dec 2012 11:58:59 +0000 (12:58 +0100)] 
tests: remove a redundant texinfo test

* t/txinfo-add-missing.sh: This one, its checks being already covered
by the more extensive 't/add-missing.tap' test.
* t/txinfo-add-missing2.sh: Rename ...
* t/txinfo-add-missing-and-dist.sh: Like this.
* t/list-of-tests.mk: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: don't list a removed tests in XFAIL_TESTS
Stefano Lattarini [Mon, 31 Dec 2012 11:49:27 +0000 (12:49 +0100)] 
tests: don't list a removed tests in XFAIL_TESTS

* t/list-of-tests.mk (XFAIL_TESTS): No longer list 't/txinfo5.sh' here,
it has been removed together with the Cygnus support.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: more explicative names for some tests
Stefano Lattarini [Mon, 31 Dec 2012 11:48:36 +0000 (12:48 +0100)] 
tests: more explicative names for some tests

Do so for several Texinfo-related tests.  Note that some of such tests
with suboptimal names are *not* renamed; that's because they are going
to be removed in the master branch anyway (since they check from some
soon-to-be-removed features), so renaming them would be wasted work,
and could even create useless merge conflicts.

* t/txinfo2.sh: Rename ...
* t/txinfo-no-extra-dist.sh: ... like this.
* t/txinfo3.sh: Rename ...
* t/txinfo-suffix-less-info.sh: ... like this.
* t/txinfo4.sh: Rename ...
* t/txinfo-unrecognized-info-suffix.sh: ... like this.
* t/txinfo6.sh: Rename ...
* t/txinfo-other-suffixes.sh: ... like this.
* t/txinfo7.sh: Rename ...
* t/txinfo-add-missing.sh: ... like this.
* t/txinfo8.sh: Rename ...
* t/txinfo-add-missing2.sh: ... like this.
* t/txinfo9.sh: Rename ...
* t/txinfo-no-repeated-targets.sh: ... like this.
* t/txinfo17.sh: Rename ...
* t/txinfo-setfilename-repeated.sh: ... like this.
* t/txinfo13.sh: Rename ...
* t/txinfo-subdir-pr343.sh: ... like this.
* t/txinfo16.sh: Rename ...
* t/txinfo-info-in-srcdir.sh: ... like this.
* t/txinfo21.sh: Rename ...
* t/txinfo-many-output-formats.sh: ... like this.
* t/txinfo22.sh: Rename ...
* t/txinfo-override-texinfo-tex.sh: ... like this.
* t/txinfo26.sh: Rename ...
* t/txinfo-absolute-srcdir-pr408.sh: ... like this.
* t/txinfo27.sh: Rename ...
* t/txinfo-no-installinfo.sh: ... like this.
* t/txinfo29.sh: Rename ...
* t/txinfo-override-infodeps.sh: ... like this.
* t/txinfo31.sh: Rename ...
* t/txinfo-setfilename-suffix-match.sh: ... like this.
* t/txinfo32.sh: Rename ...
* t/txinfo-bsd-make-recurs.sh: ... like this.
* t/txinfo33.sh: Rename ...
* t/txinfo-clean.sh: ... like this.
* t/list-of-tests.mk: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agocleanup: drop a redundant %?FIRST% transform
Stefano Lattarini [Sat, 11 Aug 2012 17:36:08 +0000 (19:36 +0200)] 
cleanup: drop a redundant %?FIRST% transform

* lib/am/texinfos.am: Here: this file is only included one time
per Makefile by Automake.

Cherry picked from Automake-NG commit 'v1.12.2-864-g5c580b0'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: state when compatibility cruft should be removed or warned about
Stefano Lattarini [Mon, 31 Dec 2012 08:53:43 +0000 (09:53 +0100)] 
maint: state when compatibility cruft should be removed or warned about

* automake.in: Here.
* lib/Automake/Options.pm: And here.
* m4/obsolete-err.m4: And here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Sun, 30 Dec 2012 11:12:27 +0000 (12:12 +0100)] 
Merge branch 'master' into ng/master

* master:
  fixup: copyright yars in two recent tests
  obsolete: fixup: don't use AU_DEFUN where AC_DEFUN is required
  obsolete: better error message if AM_PROG_MKDIR_P is used
  NEWS: document removal of AM_PROG_MKDIR_P macro
  NEWS: minor fixup
  obsolete: better error message if AM_PROG_CC_STDC is used
  obsolete: better error message if AM_CONFIG_HEADER is used
  sync: update files from upstream with "make fetch"
  tests: better names for temporary configure.ac files

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Sun, 30 Dec 2012 11:09:44 +0000 (12:09 +0100)] 
Merge branch 'maint'

* maint:
  fixup: copyright yars in two recent tests
  obsolete: fixup: don't use AU_DEFUN where AC_DEFUN is required

12 years agofixup: copyright yars in two recent tests
Stefano Lattarini [Sun, 30 Dec 2012 11:00:07 +0000 (12:00 +0100)] 
fixup: copyright yars in two recent tests

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoobsolete: fixup: don't use AU_DEFUN where AC_DEFUN is required
Stefano Lattarini [Sun, 30 Dec 2012 10:58:52 +0000 (11:58 +0100)] 
obsolete: fixup: don't use AU_DEFUN where AC_DEFUN is required

* m4/obsolete-err.m4: Here, for the definition of 'AM_PROG_CC_STDC'

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoobsolete: better error message if AM_PROG_MKDIR_P is used
Stefano Lattarini [Sun, 30 Dec 2012 10:57:02 +0000 (11:57 +0100)] 
obsolete: better error message if AM_PROG_MKDIR_P is used

In Automake 1.14, the long-deprecated macro AM_PROG_MKDIR_P will be
removed.  Instead of simply dropping the macro definition, which would
cause unclear error messages in aclocal and autoconf:

    configure.ac:4: warning: macro 'AM_PROG_MKDIR_P' not found in library
    configure.ac:4: error: possibly undefined macro: AM_PROG_MKDIR_P
      If this token and others are legitimate, please use m4_pattern_allow.
      See the Autoconf documentation.

we re-add an AM_PROG_MKDIR_P definition that simply raises a *clear* error
message when the macro is used.

See also recent similar commits 'v1.13-5-g9c07d89' and 'v1.13-4-g8e921bf'

* t/am-prog-mkdir-p-no-more.sh: New test.
* t/list-of-tests.mk: Add it.
* m4/obsolete-err.m4: Add the new "error-raising" definition for
AM_PROG_MKDIR_P.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoNEWS: document removal of AM_PROG_MKDIR_P macro
Stefano Lattarini [Sun, 30 Dec 2012 10:40:53 +0000 (11:40 +0100)] 
NEWS: document removal of AM_PROG_MKDIR_P macro

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Sun, 30 Dec 2012 10:38:16 +0000 (11:38 +0100)] 
Merge branch 'maint'

* maint:
  NEWS: minor fixup
  obsolete: better error message if AM_PROG_CC_STDC is used
  obsolete: better error message if AM_CONFIG_HEADER is used
  sync: update files from upstream with "make fetch"
  tests: better names for temporary configure.ac files

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoNEWS: minor fixup
Stefano Lattarini [Sun, 30 Dec 2012 10:24:44 +0000 (11:24 +0100)] 
NEWS: minor fixup

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoobsolete: better error message if AM_PROG_CC_STDC is used
Stefano Lattarini [Sun, 30 Dec 2012 10:04:39 +0000 (11:04 +0100)] 
obsolete: better error message if AM_PROG_CC_STDC is used

In Automake 1.13, the long-deprecated (since 2002) macro AM_PROG_CC_STDC
has been removed.  Such a removal, albeit sensible and justified, was
probably done in a too-abrupt way, since it didn't turn the pre-existing
warning messages into fatal error messages, but simply dropped the macro
definition, so that remaining usages of it would cause unclear error
messages, e.g.:

    configure.ac:4: warning: macro 'AM_PROG_CC_STDC' not found in library

from aclocal, and:

    configure.ac:4: error: possibly undefined macro: AM_PROG_CC_STDC
      If this token and others are legitimate, please use m4_pattern_allow.
      See the Autoconf documentation.

from autoconf.

In an attempt to mitigate this issue, we re-add an AM_PROG_CC_STDC
definition that simply raises a *clear* error message when the macro
is used.

* t/am-prog-cc-stdc-no-more.sh: New test.
* t/list-of-tests.mk: Add it.
* m4/obsolete-err.m4: Add the new "error-raising" definition for
AM_PROG_CC_STDC; the error message is a variation of the one already
present in the older version of this macro, before it got removed in
commit 'v1.12-15-gd2ca168'.
* NEWS: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoobsolete: better error message if AM_CONFIG_HEADER is used
Stefano Lattarini [Sun, 30 Dec 2012 09:33:23 +0000 (10:33 +0100)] 
obsolete: better error message if AM_CONFIG_HEADER is used

In Automake 1.13, the long-deprecated macro AM_CONFIG_HEADER (deprecated
since 2002) has been removed in favour of AC_CONFIG_HEADERS.  However,
the removal was done without a proper deprecation period, and that
caused packages upgrading to Automake 1.13 to fail with very unclear
error messages, e.g.:

    configure.ac:4: warning: macro 'AM_CONFIG_HEADER' not found in library

from aclocal, and:

    configure.ac:4: error: possibly undefined macro: AM_CONFIG_HEADER
      If this token and others are legitimate, please use m4_pattern_allow.
      See the Autoconf documentation.

from autoconf.

In an attempt to mitigate this issue, we re-add an AM_CONFIG_HEADER
definition that simply raises a *clear* error message when the macro
is used.

Report by Paolo Bonzini:
<http://lists.gnu.org/archive/html/automake/2012-12/msg00039.html>

* t/am-config-header-no-more.sh: New test.
* t/list-of-tests.mk: Add it.
* m4/obsolete-err.m4: New file, contain the new AM_CONFIG_HEADER
"error-raising" definition, as well as the definition of the
similarly obsolete macros 'AM_C_PROTOTYPES' and 'fp_C_PROTOTYPES',
moved in from ...
* m4/protos.m4: ... this file, which has thus been removed.
* Makefile.am (dist_automake_ac_DATA): Adjust.
* t/ansi2knr-no-more.sh: Likewise.
* NEWS: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agosync: update files from upstream with "make fetch"
Stefano Lattarini [Sat, 29 Dec 2012 14:28:41 +0000 (15:28 +0100)] 
sync: update files from upstream with "make fetch"

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

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: better names for temporary configure.ac files
Stefano Lattarini [Sat, 29 Dec 2012 08:47:33 +0000 (09:47 +0100)] 
tests: better names for temporary configure.ac files

When editing a pre-existent 'configure.ac' file in a test script, name
the temporary file 'configure.tmp' rather than 'configure.int'; the
latter was a relict of the times when we used 'configure.in' as the
default name for the Autoconf input files throughout the testsuite.

* t/cond43.sh: Adjust.
* t/depcomp8a.sh: Likewise.
* t/depcomp8b.sh: Likewise.
* t/gettext.sh: Likewise.
* t/mmode.sh: Likewise.
* t/pr401.sh: Likewise.
* t/pr401b.sh: Likewise.
* t/pr401c.sh: Likewise.
* t/python11.sh: Likewise.
* t/cond42.sh: Likewise.  Also, while at it, rename ...
(edit_configure_in): ... this function ...
(edit_configure_ac): ... like this.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoNG-NEWS: prefer "no longer" over "not anymore"; plus few minor fixlets
Stefano Lattarini [Sat, 29 Dec 2012 08:34:07 +0000 (09:34 +0100)] 
NG-NEWS: prefer "no longer" over "not anymore"; plus few minor fixlets

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Fri, 28 Dec 2012 23:50:34 +0000 (00:50 +0100)] 
Merge branch 'master' into ng/master

* master:
  NEWS: better distinction between obsolete and obsolescent features
  cleanup: get rid of 'Automake::Configure_ac' module
  maint: remove last vestiges of 'configure.in' support from the testsuite
  tests: remove a botched comment from a test case
  maint: reflect removal of 'configure.in' support in comments and messages
  Drop support for 'configure.in' as the Autoconf input file
  Drop support for $(ACLOCAL_M4_SOURCES), it's obsolete

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoNEWS: better distinction between obsolete and obsolescent features
Stefano Lattarini [Fri, 28 Dec 2012 23:45:56 +0000 (00:45 +0100)] 
NEWS: better distinction between obsolete and obsolescent features

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agocleanup: get rid of 'Automake::Configure_ac' module
Stefano Lattarini [Fri, 25 May 2012 15:51:01 +0000 (17:51 +0200)] 
cleanup: get rid of 'Automake::Configure_ac' module

Now that we unconditionally assume the Autoconf input is named
"configure.ac", it's easier and clearer to inline the checks on
the existence of such a file directly in the automake and
aclocal scripts.

This change is basically a backport of the 'v1.12-327-gee6d72a'
commit from Automake-NG.

* lib/Automake/Variable.pm (Automake::Configure_ac): Drop this import.
($configure_ac): Define to "configure.ac", unconditionally.
* automake.in: Likewise.  Also, in main code, check the existence
of 'configure.ac' directly, instead of calling the now-removed
'require_configure_ac' function.
* aclocal.in: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: remove last vestiges of 'configure.in' support from the testsuite
Stefano Lattarini [Fri, 28 Dec 2012 23:10:14 +0000 (00:10 +0100)] 
maint: remove last vestiges of 'configure.in' support from the testsuite

* syntax-checks.mk: Don't whitelist any file in the maintainer
check looking against use of 'configure.in' in the testsuite.
* t/autodist-configure-no-subdir.sh: Remove last references to
'configure.in'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: remove a botched comment from a test case
Stefano Lattarini [Fri, 28 Dec 2012 23:03:44 +0000 (00:03 +0100)] 
tests: remove a botched comment from a test case

* t/backcompat6.sh: Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: reflect removal of 'configure.in' support in comments and messages
Stefano Lattarini [Fri, 28 Dec 2012 22:59:00 +0000 (23:59 +0100)] 
maint: reflect removal of 'configure.in' support in comments and messages

* t/help.sh, syntax-checks.mk, aclocal.in, old/TODO: In these files.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoDrop support for 'configure.in' as the Autoconf input file
Stefano Lattarini [Fri, 25 May 2012 15:50:59 +0000 (17:50 +0200)] 
Drop support for 'configure.in' as the Autoconf input file

The autoconf input should be named 'configure.ac' instead.  The use
of 'configure.in' has been deprecated in Autoconf since at least
the 2.13 -> 2.50 transition, and future Autoconf versions (starting
with 2.70 probably) will start to warn about it at runtime.  Automake
has been warning about it since the 1.13 release.

This change is basically a backport of commit 'v1.12-325-g927d4cb',
from Automake-NG.

* lib/Automake/Configure_ac.pm (find_configure_ac): Don't look for
'configure.in' if 'configure.ac' is not found.
(require_configure_ac): On failure, don't tell that "'configure.ac'
or 'configure.in' is required", but just that "'configure.ac' is
required".
* automake.in (@common_sometimes): Don't list 'configure.in'.
(scan_autoconf_files): Adjust heading comments.
* NEWS: Update.
* t/help.sh: Adjust.
* t/configure.sh: Remove as obsolete.
* t/list-of-tests.mk: Adjust.

12 years agoNG-NEWS: adjust w.r.t. recent changes in Automake master
Stefano Lattarini [Fri, 28 Dec 2012 22:35:03 +0000 (23:35 +0100)] 
NG-NEWS: adjust w.r.t. recent changes in Automake master

The next version of Automake (1.14) is planned to drop few obsolete
features that have already been removed in Automake-NG.  There is
thus no need to list this dropped features in our NG-NEWS file (as
Automake-NG will certainly see no stable release before Automake
1.14 is out).

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoDrop support for $(ACLOCAL_M4_SOURCES), it's obsolete
Stefano Lattarini [Fri, 28 Dec 2012 22:24:21 +0000 (23:24 +0100)] 
Drop support for $(ACLOCAL_M4_SOURCES), it's obsolete

The $(ACLOCAL_M4_SOURCES) variables has been obsolete by a long time,
and basically unused (since at least commit ab57cf28 of 2003-04-24), so
drop any mention of it.

* automake.in (scan_aclocal_m4): Flatly reject any ACLOCAL_M4_SOURCES
definition with a fatal error, rather than just warning about it.
if any deinifn
$(ACLOCAL_M4_SOURCES).  Don't append it to @ac_deps.  This makes such
variable always empty, so there's no need to return it.  Adjust the
signature of this function accordingly, and ...
(handle_configure): ... update this function accordingly.
* NEWS: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Fri, 28 Dec 2012 21:08:46 +0000 (22:08 +0100)] 
Merge branch 'master' into ng/master

* master:
  tests: remove stray uses of 'Exit', in favour of simple 'exit'
  general: assume dot-starting file names are supported
  Drop support for DJGPP, MS-DOS, Windows 95/98/ME
  depcomp: remove support for SGI C/C++ compilers
  tests: a test about warnings in category 'obsolete' was failing spuriously
  ACLOCAL_AMFLAGS: fully deprecate, with warnings in the 'obsolete' category
  compile: remove support for $(INCLUDES)
  aclocal: allow third-party macros take precedence over automake ones

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: remove stray uses of 'Exit', in favour of simple 'exit'
Stefano Lattarini [Fri, 28 Dec 2012 20:59:33 +0000 (21:59 +0100)] 
tests: remove stray uses of 'Exit', in favour of simple 'exit'

* t/warnopts.sh: Here.  Suggested by the 'sc_tests_exit_not_Exit'
maintainer check.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'remove-djgpp-support'
Stefano Lattarini [Fri, 28 Dec 2012 20:57:44 +0000 (21:57 +0100)] 
Merge branch 'remove-djgpp-support'

* remove-djgpp-support:
  general: assume dot-starting file names are supported
  Drop support for DJGPP, MS-DOS, Windows 95/98/ME

12 years agogeneral: assume dot-starting file names are supported
Stefano Lattarini [Wed, 30 May 2012 07:25:59 +0000 (09:25 +0200)] 
general: assume dot-starting file names are supported

Now that we've dropped support for DJGPP, Windows 95/98/ME
and MS-DOS, that should always the case.

This change is basically a backport of Automake-NG commit
'v1.12-342-ge6af355'.

* lib/am/texibuild.am: Just assume we can have directories whose
name starts with a dot, i.e., that '${am__leading_dot}' expands
to '.'.
* automake.in (require_build_directory): Likewise.
* m4/depend.m4 (AM_SET_DEPDIR): Likewise.  Now $(DEPDIR) will
be set unconditionally to '.deps'.
* m4/init.m4 (AM_INIT_AUTOMAKE): Don't AC_REQUIRE the m4 macro
'AM_SET_LEADING_DOT' anymore.
* m4/lead-dot.m4: Delete.
* Makefile.am (dist_automake_ac_DATA): Remove it.
* t/subobj11a.sh: Just assume $(DEPDIR) expands to '.deps'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoDrop support for DJGPP, MS-DOS, Windows 95/98/ME
Stefano Lattarini [Tue, 29 May 2012 17:51:22 +0000 (19:51 +0200)] 
Drop support for DJGPP, MS-DOS, Windows 95/98/ME

Basically a backport and squash-in of three Automake-NG commits:
v1.12.1-447-g041fe15v1.12-343-g4526363v1.12-341-gc853c20,
plus proper simplifications of the ylwrap script.

See also:
<http://lists.gnu.org/archive/html/automake-ng/2012-05/msg00104.html>

* automake.in (BEGIN): Don't override $ENV{SHELL} for DJGPP.
(handle_libtool): Do not bother cleaning '_libs' directories, they
are only used by Libtool on MS-DOS (and we no longer support that
setup).
* syntax-checks.mk (automake_diff_no): Adjust, as now there are only
seven (not eight) different lines between 'automake.in' and 'automake'.
* bootstrap.sh: Don't special case the default value for BOOTSTRAP_SHELL
on DJGPP.  While we are at, allow that variable to be overridden from
the environment. Also, adjust comments: we don't use "ln -s" not because
it's not properly supported by DJGPP, but because it might not be
properly supported by MinGW/MSYS.
* configure.ac (MODIFICATION_DELAY): Define to '2' unconditionally, as
we no longer have to cater to quirks of Windows 95/98/ME.
* lib/am/texibuild.am: Remove support for '*.iNN' files used on DJGPP.
* lib/am/texinfos.am: Likewise.
* lib/ylwrap: Remove support for DOS-specific filenames for bison
output.
* t/txinfo19.sh: Remove as obsolete.
* t/list-of-tests.mk: Adjust.
* NEWS: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agodepcomp: remove support for SGI C/C++ compilers
Stefano Lattarini [Wed, 19 Dec 2012 17:12:04 +0000 (18:12 +0100)] 
depcomp: remove support for SGI C/C++ compilers

These compilers are only meant to run on IRIX, and that system has seen
its last release in 2006, and is expected to lose support from SGI in
December 2013:
<http://www.sgi.com/services/support/irix_mips_support.html>

This change fixes automake bug#12967 and bug#12978.

* lib/depcomp (sgi): Remove this depmode.
* NEWS: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: a test about warnings in category 'obsolete' was failing spuriously
Stefano Lattarini [Fri, 28 Dec 2012 20:40:16 +0000 (21:40 +0100)] 
tests: a test about warnings in category 'obsolete' was failing spuriously

* t/warnings-obsolete-default.sh : After our removal of $(INCLUDES)
support, this test has been spuriously failing because it was assuming
that a definition of the INCLUDES make variable only caused a warning
rather than a fatal error.  Fix it to use a definition of the newly
obsolescent ACLOCAL_AMFLAGS make variable.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoACLOCAL_AMFLAGS: fully deprecate, with warnings in the 'obsolete' category
Stefano Lattarini [Sat, 22 Sep 2012 23:24:12 +0000 (01:24 +0200)] 
ACLOCAL_AMFLAGS: fully deprecate, with warnings in the 'obsolete' category

Users are expected to use the AC_CONFIG_MACRO_DIR{,S} autoconf macros
instead.  And the use of the '--install' aclocal option in ACLOCAL_AMFLAGS
has proved to be a bad idea anyway -- see automake bug#9037.

* NEWS: Update.
* t/aclocal-amflags.sh: Enhance and adjust.
* t/acloca14b.sh: Adjust.
* t/acloca22b.sh: Likewise.
* t/ax/distcheck-hook-m4.am: Likewise.
* t/dist-missing-m4.sh: Likewise.
* t/remake-renamed-m4-macro.sh: Likewise.
* t/remake-renamed-m4-macro-and-file.sh: Likewise.
* t/remake-renamed-m4-file.sh: Likewise.
* t/remake-moved-m4-file.sh: Likewise.
* t/remake-gnulib-remove-header.sh: Likewise.
* t/remake-gnulib-add-acsubst.sh: Likewise.
* t/remake-deleted-m4-file.sh: Likewise.
* t/remake-deleted-m4-file.sh: Likewise.
* t/libtool-macros.sh: Likewise.
* t/gettext-macros.sh: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agocompile: remove support for $(INCLUDES)
Stefano Lattarini [Wed, 22 Aug 2012 14:40:15 +0000 (16:40 +0200)] 
compile: remove support for $(INCLUDES)

It has already been deprecated in the manual and by warnings in the
'obsolete' category for ages (at least since 2003), in favour of
AM_CPPFLAGS.  Automake-NG has removed support for it already.  And
the warnings in the obsolete category are on by default since the
1.12.4 release.

So, by removing it in Automake 1.14, we will simplify the transition
path for people that want to switch to Automake-NG.

See also Automake-NG commit v1.12-267-g6b74968 of 2012-05-21,
"[ng] compile: don't support $(INCLUDES) anymore, it's obsolete".

* NEWS, doc/automake.texi: Update.
* automake.in (generate_makefile): Reject INCLUDES unconditionally.
In all languages: don't add $(INCLUDES) to the compiler command line.
* t/includes-deprecation.sh: New test.
* t/list-of-tests.mk: Add it.
* t/werror2.sh : Adjust to avoid spurious failures.
* t/pluseq5.sh: Likewise.
* t/warnopts.sh: Likewise.

Suggested-by: Paolo Bonzini <bonzini@gnu.org>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'aclocal-lookup-order'
Stefano Lattarini [Fri, 28 Dec 2012 19:22:51 +0000 (20:22 +0100)] 
Merge branch 'aclocal-lookup-order'

* aclocal-lookup-order:
  aclocal: allow third-party macros take precedence over automake ones

12 years agoaclocal: allow third-party macros take precedence over automake ones
Stefano Lattarini [Sat, 24 Nov 2012 19:32:48 +0000 (20:32 +0100)] 
aclocal: allow third-party macros take precedence over automake ones

It makes sense to allow "local system-wide" m4 macros take precedence
over built-in macros (defined in the aclocal versioned m4 directory
"${prefix}/share/aclocal-${APIVERSION}"), the same way we allow
"environment-level" m4 macros (through the ACLOCAL_PATH environment
variable ) take precedence over system-wide third-party macros.

An example: after this change, a definition of AM_PROG_VALAC placed
in file (say) '/usr/local/share/aclocal/my-vala.m4' should take
precedence over the same-named automake-provided macro defined in
file '/usr/local/share/aclocal-1.14/vala.m4'.

Even more importantly, after this change, m4 macros accessible
through $ACLOCAL_PATH entries will take precedence over m4 macros
defined in the aclocal versioned m4 directory; it was quite counter
intuitive that it was not the case before.

* aclocal.in (scan_m4_files): Search files in @system_includes before
files in @automake_includes.
* t/aclocal-acdir.sh: Adjust.
* t/aclocal-path-precedence.sh: Likewise.
* t/dirlist.sh: Likewise.
* doc/automake.texi: Adjust.
* NEWS: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Fri, 28 Dec 2012 19:05:51 +0000 (20:05 +0100)] 
Merge branch 'master' into ng/master

* master:
  post-release: major version bump
  post-release: minor version bump
  release: stable major release 1.13
  news: fix botched URL
  ylwrap: various fixes
  tests: strengthen the ylwrap tests
  NEWS: we plan to ditch MS-DOS/DJGPP support in future Automake versions

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge remote-tracking branch 'origin/ng/master' into ng/master
Stefano Lattarini [Fri, 28 Dec 2012 18:14:15 +0000 (19:14 +0100)] 
Merge remote-tracking branch 'origin/ng/master' into ng/master

Fix-up a local branch mess-up.  Luckily not serious at all.
Still, sorry for the noise.

* origin/ng/master:
  [Nothing really to be merged]

12 years agoMerge branch 'am-prog-mkdir-p-remove'
Stefano Lattarini [Fri, 28 Dec 2012 18:04:02 +0000 (19:04 +0100)] 
Merge branch 'am-prog-mkdir-p-remove'

Finally backporting the AM_PROG_MKDIR_P removal that has already taken
place in Automake-NG.  We can safely do this since the latest Gettext
release (1.18.2) has removed all uses of AM_PROG_MKDIR_P, replacing
them with uses of AC_PROG_MKDIR_P instead.

References:
<http://lists.gnu.org/archive/html/bug-gettext/2012-12/msg00064.html>
<http://lists.gnu.org/archive/html/automake/2012-12/msg00024.html>
Commit v0.18.1.1-147-g2cccb4c in the Gettext git repository.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Fri, 28 Dec 2012 17:58:45 +0000 (18:58 +0100)] 
Merge branch 'maint'

Actually a dummy merge, since we retain our own "1.13a" version
number.

* maint:
  post-release: minor version bump

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agopost-release: major version bump
Stefano Lattarini [Fri, 28 Dec 2012 17:49:18 +0000 (18:49 +0100)] 
post-release: major version bump

This is for the master branch.

* configure.ac, m4/amversion.m4: Bump version to 1.13a.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agopost-release: minor version bump
Stefano Lattarini [Fri, 28 Dec 2012 17:41:38 +0000 (18:41 +0100)] 
post-release: minor version bump

This is for the maint branch.

* configure.ac, m4/amversion.m4: Bump version to 1.13.0a.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agorelease: stable major release 1.13 v1.13
Stefano Lattarini [Fri, 28 Dec 2012 17:12:33 +0000 (18:12 +0100)] 
release: stable major release 1.13

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

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agonews: fix botched URL
Stefano Lattarini [Mon, 24 Dec 2012 09:44:10 +0000 (10:44 +0100)] 
news: fix botched URL

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoylwrap: various fixes
Akim Demaille [Wed, 19 Dec 2012 13:51:58 +0000 (14:51 +0100)] 
ylwrap: various fixes

Rename properly header guards in generated header files, instead of
leaving Y_TAB_H.

Convert header guards in implementation files.  Because ylwrap failed
to rename properly #include in the implementation files, current
versions of Bison (e.g., 2.7) duplicate the generated header file in
the implementation file.  The header guard then protects the
implementation file from duplicate definitions from the header file.

Generate header guards with a single '_' for series of non alphabetic
characters, instead of several.  This is what Bison does.

Makes the test t/yacc-d-basic.sh pass again.

* lib/ylwrap (guard): Properly honor $1 to rename properly the
header guards.
Keep a single _ instead of several.
(rename_sed): Rename as...
(sed_fix_filenames): this.
Suggested by Stefano Lattarini.
(sed_fix_header_guards): New.
Use it.

12 years agotests: strengthen the ylwrap tests
Akim Demaille [Wed, 19 Dec 2012 13:30:06 +0000 (14:30 +0100)] 
tests: strengthen the ylwrap tests

* t/yacc-d-basic.sh: Comment changes.
(generated): New.
Use it to factor various tests.
Check that Y_TAB_H is not issued.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoNEWS: we plan to ditch MS-DOS/DJGPP support in future Automake versions
Stefano Lattarini [Wed, 19 Dec 2012 17:19:42 +0000 (18:19 +0100)] 
NEWS: we plan to ditch MS-DOS/DJGPP support in future Automake versions

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Wed, 19 Dec 2012 12:06:10 +0000 (13:06 +0100)] 
Merge branch 'master' into ng/master

* master:
  maint: typofixes in makefile comments
  maint: remove extra verbosity from a maintainer rule
  NEWS: fix grammaro
  maint: version bump after beta release
  release: beta release 1.12b (will become 1.13)
  cosmetics: comments fixlets in our Makefile
  cosmetics: consistency changes in some make recipes
  tests: avoid a spurious failure on NetBSD
  tests: re-enable some checks disabled by mistake ...
  tests: avoid a "grep -E" portability issue
  tests: avoid a spurious failure due to a Clang bug
  NEWS: start preparing for the 1.13 release
  tests: typofix in the shebang line of 't/py-compile-destdir.sh'
  HACKING: release process: fixlets about the announcement
  maint: post-release minor version bump
  release: stable release 1.12.5
  tests: avoid errors due to underquoted third-party macros
  maintcheck: also consider contrib tests for syntax checks
  cosmetics: whitespace fixlets in syntax-checks.mk

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: typofixes in makefile comments
Stefano Lattarini [Wed, 19 Dec 2012 11:16:27 +0000 (12:16 +0100)] 
maint: typofixes in makefile comments

* maint.mk (git-upload-release): Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: remove extra verbosity from a maintainer rule
Stefano Lattarini [Wed, 19 Dec 2012 11:06:38 +0000 (12:06 +0100)] 
maint: remove extra verbosity from a maintainer rule

* maint.mk (git-upload-release): Here, by adding a forgotten
'@' recipe modifier.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoNEWS: fix grammaro
Stefano Lattarini [Wed, 19 Dec 2012 11:05:08 +0000 (12:05 +0100)] 
NEWS: fix grammaro

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: version bump after beta release
Stefano Lattarini [Wed, 19 Dec 2012 11:02:21 +0000 (12:02 +0100)] 
maint: version bump after beta release

* configure.ac (AC_INIT): Bump version number to 1.12c, as per
HACKING suggestion.
* m4/amversion.m4: Likewise (autoupdated by "make bootstrap").

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agorelease: beta release 1.12b (will become 1.13) v1.12b
Stefano Lattarini [Wed, 19 Dec 2012 10:18:53 +0000 (11:18 +0100)] 
release: beta release 1.12b (will become 1.13)

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

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agocosmetics: comments fixlets in our Makefile
Stefano Lattarini [Wed, 19 Dec 2012 09:42:56 +0000 (10:42 +0100)] 
cosmetics: comments fixlets in our Makefile

* Makefile.am: Prefer '#' comments over '##' ones where it makes sense.
Other minor style tweaks to comments about "updated later" variables.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agocosmetics: consistency changes in some make recipes
Stefano Lattarini [Wed, 19 Dec 2012 09:40:13 +0000 (10:40 +0100)] 
cosmetics: consistency changes in some make recipes

* Makefile.am (install-exec-hook, uninstall-hook): Don't use extra
quoting in variable assignments.  More consistent use of whitespace.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: avoid a spurious failure on NetBSD
Stefano Lattarini [Tue, 18 Dec 2012 11:20:23 +0000 (12:20 +0100)] 
tests: avoid a spurious failure on NetBSD

* t/tags-pr12372.sh (configure.ac): AC_SUBST the LINK variable to a
dummy invocation, to avoid possible errors from make or the linker;
errors we do not care about in the least in this test.
(Makefile.am, sub/Makefile.am): Remove LINK definitions; simply
inherit that in configure.ac.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: re-enable some checks disabled by mistake ...
Stefano Lattarini [Tue, 18 Dec 2012 10:51:18 +0000 (11:51 +0100)] 
tests: re-enable some checks disabled by mistake ...

* t/subpkg-macrodir.sh: ... in this test.  And fix some typos that would
have caused the newly re-enabled check to spuriously fail.  Issue revealed
by the lack of '.PHONY' support in Solaris CCS make (yes, so we've been
actually *helped* by that make implementation once, at last.  Scary ;-)

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: avoid a "grep -E" portability issue
Stefano Lattarini [Tue, 18 Dec 2012 10:46:40 +0000 (11:46 +0100)] 
tests: avoid a "grep -E" portability issue

As stated in the Autoconf manual, the empty alternative is not portable
with "grep -E".  For example, while with GNU grep we have:

    $ echo b | grep -E '(|a)b'; echo status = $?
    b
    status = 0

with Solaris 10 /usr/xpg4/bin/grep we have:

    $ echo b | grep -E '(|a)b'; echo status = $?
    1
    status = 1

* t/silent-texi.sh: That was causing a spurious failure here.  Fix it
by simply using '?' instead (as suggested by the Autoconf manual).

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: avoid a spurious failure due to a Clang bug
Stefano Lattarini [Tue, 18 Dec 2012 10:30:39 +0000 (11:30 +0100)] 
tests: avoid a spurious failure due to a Clang bug

This version of clang:

    clang version 3.2 (trunk 163574)
    Target: powerpc64-unknown-linux-gnu
    Thread model: posix

caused the test 't/ltcond2.sh' to spuriously fail due to what
appeared like a clang bug.  Here is a part of the diagnostic (trimmed
down for better clarity):

    clang: .../cfarm/llvm/lib/MC/MCAsmStreamer.cpp:338: \
      virtual void {anonymous}::MCAsmStreamer::EmitLabel(llvm::MCSymbol*): \
      Assertion `Symbol->isUndefined() && "Cannot define a symbol twice!"' \
      failed.
    ...
    7  clang  0x0000000012a459c4 llvm::AsmPrinter::EmitGlobalVariable\
      (llvm::GlobalVariable const*) + 18446744073680468044
    8  clang  0x0000000012a490a8 llvm::AsmPrinter::doFinalization\
      (llvm::Module&) + 18446744073680481840
    ...
    Stack dump:
    0.  Program arguments: .../opt/cfarm/clang-2012.09.10/bin/clang \
          -cc1 -triple powerpc64-unknown-linux-gnu -S -disable-free \
          ...
    1.  <eof> parser at end of file
    2.  Code generation
    3.  Running pass 'Function Pass Manager' on module 'hello-generic.c'.
    clang: error: unable to execute command: Aborted
    clang: error: clang frontend command failed due to signal (use -v to \
           see invocation)
    clang version 3.2 (trunk 163574)
    Target: powerpc64-unknown-linux-gnu
    Thread model: posix

So tweak the affected test case to avoid triggering this bug.  This is
the easiest way for us to keep the testsuite result clean and meaningful
on our main Clang test bed.

* t/ltcond2.sh: Prefer using "extern const char *" variables rather
than functions returning a statically allocated "const char *" variable.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoNEWS: start preparing for the 1.13 release
Stefano Lattarini [Sun, 16 Dec 2012 12:36:14 +0000 (13:36 +0100)] 
NEWS: start preparing for the 1.13 release

* NEWS: Here.  In particular, list (some of) the planned future
backward-incompatibilities that will take place in Automake 1.14.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Sun, 16 Dec 2012 12:08:13 +0000 (13:08 +0100)] 
Merge branch 'maint'

* maint:
  tests: typofix in the shebang line of 't/py-compile-destdir.sh'
  HACKING: release process: fixlets about the announcement
  maint: post-release minor version bump
  release: stable release 1.12.5
  tests: avoid errors due to underquoted third-party macros
  maintcheck: also consider contrib tests for syntax checks
  cosmetics: whitespace fixlets in syntax-checks.mk
  maint: prefer $(MKDIR_P) over $(mkinstalldirs) in maintainer rules

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: typofix in the shebang line of 't/py-compile-destdir.sh'
Stefano Lattarini [Sat, 15 Dec 2012 13:17:49 +0000 (14:17 +0100)] 
tests: typofix in the shebang line of 't/py-compile-destdir.sh'

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoHACKING: release process: fixlets about the announcement
Stefano Lattarini [Sat, 15 Dec 2012 13:09:10 +0000 (14:09 +0100)] 
HACKING: release process: fixlets about the announcement

* HACKING: The announcement should be generate *before* bumping
the version number to the next alpha number.  Also, only an
abridged version of the announcement should be copied on the
Savannah news feed (a link to the complete announcement should
be linked from there, though).

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: post-release minor version bump
Stefano Lattarini [Sat, 15 Dec 2012 17:04:58 +0000 (18:04 +0100)] 
maint: post-release minor version bump

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

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agorelease: stable release 1.12.5 v1.12.6
Stefano Lattarini [Sat, 15 Dec 2012 09:37:49 +0000 (10:37 +0100)] 
release: stable release 1.12.5

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

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agotests: avoid errors due to underquoted third-party macros
Stefano Lattarini [Fri, 14 Dec 2012 17:22:33 +0000 (18:22 +0100)] 
tests: avoid errors due to underquoted third-party macros

* t/pkg-config-macros.sh: Call aclocal with the warnings in the
"syntax" category disabled.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaintcheck: also consider contrib tests for syntax checks
Stefano Lattarini [Fri, 14 Dec 2012 16:57:25 +0000 (17:57 +0100)] 
maintcheck: also consider contrib tests for syntax checks

* syntax-checks.mk (xtests): By listing them here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agocosmetics: whitespace fixlets in syntax-checks.mk
Stefano Lattarini [Fri, 14 Dec 2012 16:55:09 +0000 (17:55 +0100)] 
cosmetics: whitespace fixlets in syntax-checks.mk

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: remove reference to mkinstalldirs from maintainer rules
Stefano Lattarini [Fri, 14 Dec 2012 16:48:13 +0000 (17:48 +0100)] 
maint: remove reference to mkinstalldirs from maintainer rules

* maint.mk (files_without_copyright): Here, in the list of files
exempted from the need of having a canonical FSF copyright notice.
That is because that file has already been removed in Automake-NG.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint' into ng/master
Stefano Lattarini [Fri, 14 Dec 2012 16:41:48 +0000 (17:41 +0100)] 
Merge branch 'maint' into ng/master

* origin/maint:
  maint: prefer $(MKDIR_P) over $(mkinstalldirs) in maintainer rules

12 years agomaint: prefer $(MKDIR_P) over $(mkinstalldirs) in maintainer rules
Stefano Lattarini [Fri, 14 Dec 2012 16:17:20 +0000 (17:17 +0100)] 
maint: prefer $(MKDIR_P) over $(mkinstalldirs) in maintainer rules

* maint.mk (check-coverage-run, recheck-coverage-run): Here.  This
is especially useful since $(mkinstalldirs) is no longer available
in Automake-NG.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaintcheck: guard against 'mkinstalldir' uses also in maint.mk
Stefano Lattarini [Fri, 14 Dec 2012 16:04:35 +0000 (17:04 +0100)] 
maintcheck: guard against 'mkinstalldir' uses also in maint.mk

* syntax-checks.mk (sc_mkinstalldirs): Here, by adding
'$(srcdir)/maint.mk' to the list in '$files'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agofixup: avoid a spurious failure in self tests
Stefano Lattarini [Fri, 14 Dec 2012 15:57:29 +0000 (16:57 +0100)] 
fixup: avoid a spurious failure in self tests

* t/self-check-dir.tap: Grep 'maint.mk', not 'Makefile', for
the "compare-autodiffs" string.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Fri, 14 Dec 2012 14:49:40 +0000 (15:49 +0100)] 
Merge branch 'master' into ng/master

Noe that, with this merge, we just discarde the changes done to
the maintainer rules in Makefile.am on the 'ng/master' branch;
now that the 'maint.mk' file from the 'master' branch assumes
GNU make as well, those changes have been either rendered obsolete,
or backported (or planned to be) in the master version of
'maint.mk'.

* master:
  sync: update files from upstream with "make fetch"
  gitignore: align with recent changes
  fixup: add dummy rule for ChangeLog generation in Makefile.am
  maint: no longer use AM_MAKEFLAGS in maintainer rules
  maint: use more GNU make features in maintainer rules
  maint: move maintainer make rules in maint.mk

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Fri, 14 Dec 2012 14:43:27 +0000 (15:43 +0100)] 
Merge branch 'maint'

* maint:
  sync: update files from upstream with "make fetch"
  gitignore: align with recent changes
  fixup: add dummy rule for ChangeLog generation in Makefile.am
  maint: no longer use AM_MAKEFLAGS in maintainer rules
  maint: use more GNU make features in maintainer rules
  maint: move maintainer make rules in maint.mk

12 years agosync: update files from upstream with "make fetch"
Stefano Lattarini [Fri, 14 Dec 2012 14:10:00 +0000 (15:10 +0100)] 
sync: update files from upstream with "make fetch"

* lib/gnupload: Update.  See:
<http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00050.html>

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agogitignore: align with recent changes
Stefano Lattarini [Fri, 14 Dec 2012 14:05:58 +0000 (15:05 +0100)] 
gitignore: align with recent changes

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agofixup: add dummy rule for ChangeLog generation in Makefile.am
Stefano Lattarini [Fri, 14 Dec 2012 13:56:21 +0000 (14:56 +0100)] 
fixup: add dummy rule for ChangeLog generation in Makefile.am

So that automake won't complain about the missing ChangeLog.
The real rule for ChangeLog generation is now in maint.mk (as
it is maintainer-specific).

* Makefile.am (ChangeLog): Dummy.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: no longer use AM_MAKEFLAGS in maintainer rules
Stefano Lattarini [Fri, 14 Dec 2012 13:44:51 +0000 (14:44 +0100)] 
maint: no longer use AM_MAKEFLAGS in maintainer rules

They are not required with GNU make.

* maint.mk: Adjust accordingly.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: use more GNU make features in maintainer rules
Stefano Lattarini [Fri, 14 Dec 2012 13:35:06 +0000 (14:35 +0100)] 
maint: use more GNU make features in maintainer rules

* maint.mk: Here, throughout the file.  Other minor cleanups
and refactorings while at it.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Fri, 14 Dec 2012 10:56:06 +0000 (11:56 +0100)] 
Merge branch 'master' into ng/master

* master:
  fixup: source 'test-init.sh', not './defs', in a test
  docs: fixlet about xz compression levels and command line options
  maint: more files excluded in 'update-copyright'
  maint: adapt 'update-copyright' recipe to the new $(FETCHFILES) format
  HACKING: update instructions to update the manuals at www.gnu.org
  maint: add an explicative comment in Makefile
  maint: factor out the name of the dir where web manuals are generated
  maint: rename rules to build/upload web manuals
  cosmetic: minor variable and rules reordering in Makefile.am
  docs: build the web manuals for CVS in the builddir, not in the srcdir
  release: automate uploading of web manuals in CVS
  docs: AM_CFLAGS: remove reference to non-existing "more detailed" desc
  tests: avoid two spurious failures on FreeBSD
  tests: improve 'pkg-config' requirement

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agomaint: move maintainer make rules in maint.mk
Stefano Lattarini [Fri, 14 Dec 2012 11:36:16 +0000 (12:36 +0100)] 
maint: move maintainer make rules in maint.mk

This is done for two reasons:

  1. It will enable us to take advantage of more GNU make
     features in our maintainer-specific recipes, if we
     want to (and we probably will).

  2. The Makefile.am won't have to be modified each time a
     maintainer rule needs to be changed or tweaked; this
     will prevent useless remaking of (in particular) the
     't/testsuite-part.am' file.

* maint.mk: New, several recipes, rules and variables for
maintainer-specific tasks, extracted (with some tweaks)
from ...
* Makefile.am: ... this file.
(EXTRA_DIST): Add 'maint.mk'.
* GNUmakefile: Include 'maint.mk' after 'Makefile'.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'master' into ng/master
Stefano Lattarini [Fri, 14 Dec 2012 10:56:06 +0000 (11:56 +0100)] 
Merge branch 'master' into ng/master

* master:
  fixup: source 'test-init.sh', not './defs', in a test
  docs: fixlet about xz compression levels and command line options
  maint: more files excluded in 'update-copyright'
  maint: adapt 'update-copyright' recipe to the new $(FETCHFILES) format
  HACKING: update instructions to update the manuals at www.gnu.org
  maint: add an explicative comment in Makefile
  maint: factor out the name of the dir where web manuals are generated
  maint: rename rules to build/upload web manuals
  cosmetic: minor variable and rules reordering in Makefile.am
  docs: build the web manuals for CVS in the builddir, not in the srcdir
  release: automate uploading of web manuals in CVS
  docs: AM_CFLAGS: remove reference to non-existing "more detailed" desc
  tests: avoid two spurious failures on FreeBSD
  tests: improve 'pkg-config' requirement

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agofixup: source 'test-init.sh', not './defs', in a test
Stefano Lattarini [Fri, 14 Dec 2012 10:03:53 +0000 (11:03 +0100)] 
fixup: source 'test-init.sh', not './defs', in a test

* t/pkg-config-macros.sh: Here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
12 years agoMerge branch 'maint'
Stefano Lattarini [Fri, 14 Dec 2012 09:43:21 +0000 (10:43 +0100)] 
Merge branch 'maint'

* maint:
  docs: fixlet about xz compression levels and command line options
  maint: more files excluded in 'update-copyright'
  maint: adapt 'update-copyright' recipe to the new $(FETCHFILES) format
  HACKING: update instructions to update the manuals at www.gnu.org
  maint: add an explicative comment in Makefile
  maint: factor out the name of the dir where web manuals are generated
  maint: rename rules to build/upload web manuals
  cosmetic: minor variable and rules reordering in Makefile.am
  docs: build the web manuals for CVS in the builddir, not in the srcdir
  release: automate uploading of web manuals in CVS
  docs: AM_CFLAGS: remove reference to non-existing "more detailed" desc
  tests: avoid two spurious failures on FreeBSD
  tests: improve 'pkg-config' requirement