From: Stefano Lattarini Date: Thu, 8 Sep 2011 15:12:38 +0000 (+0200) Subject: Merge branch 'maint' X-Git-Tag: ng-0.5a~127 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eae542988e2cf151abd296864ee12dfee9c74c6d;p=thirdparty%2Fautomake.git Merge branch 'maint' * maint: aclocal: more granularity in acdir overriding --- eae542988e2cf151abd296864ee12dfee9c74c6d diff --cc ChangeLog index 54d75549b,c25b41ebf..0152bfc8c --- a/ChangeLog +++ b/ChangeLog @@@ -1,14 -1,42 +1,53 @@@ + 2011-09-06 Stefano Lattarini + + aclocal: more granularity in acdir overriding + Before this change, using the `--acdir' option caused aclocal to + redefine both the directory of automake-provided m4 macros and the + directory of third-party system-wide m4 macros. With this change, + we deprecate the `--acdir' aclocal option, and introduce two new + options `--automake-acdir' and `--system-acdir', to allow for more + granularity. + * aclocal.in (@automake_includes, @system_includes, + @user_includes): Fix and extend comments. + (usage): Update. + (handle_acdir_option): New function. + (parse_arguments): Recognize new options `--system-acdir' and + `automake-acdir', and handle `--acdir' using the new function + above. Simplify logic by assuming that the directory of + third-party system-wide m4 files always exists. + * tests/aclocal.in: Update to use the new options, instead of + the deprecated. `--acdir'. + * m4/dirlist: Move ... + * m4/acdir/dirlist: ... here. + * m4/Makefile.am (EXTRA_DIST): Update. + (m4datadir): Rename ... + (automake_acdir): ... to this. Accordingly, ... + (dist_m4data_DATA): ... rename this ... + (dist_automake_ac_DATA): ... to this. + (system_acdir): New, directory. + (dist_system_ac_DATA): New, defined to an empty value; this will + ensure that the $(system_acdir) directory will be created by + "make install". + * tests/aclocal.test: Remove check about the `--print-ac-dir' + option of aclocal, it has been moved into ... + * tests/aclocal-print-acdir.test: ... this new test, and quite + extended. + * tests/aclocal-acdir.test: New test. + * tests/Makefile.am (TESTS): Add the new tests. + * NEWS, bootstrap: Update. + * doc/automake.texi (aclocal Options, Macro Search Path): Update. + +2011-09-06 Stefano Lattarini + + tests: fix spurious failures due to ignored signals + * tests/defs (is_blocked_signal): New function. + * tests/parallel-tests-interrupt.test: Do not try to use/trap + signals that are ignored by the parent shell: they will be + ignored by all the child processes too. + * tests/self-check-exit.test: Likewise. + * tests/self-check-cleanup.test: Likewise, and do few minor + improvements and extensions since we are at it. + 2011-09-05 Peter Rosin * tests/amhello-binpkg.test: Add missing $EXEEXT usage. diff --cc NEWS index 9e391c970,776650d3a..60b89d5ab --- a/NEWS +++ b/NEWS @@@ -1,20 -1,20 +1,28 @@@ -New in 1.11.0a: +New in 1.11a: -* WARNING: Future backward-incompatibilities! +* Changes to automake: - - The Automake support for automatic de-ANSI-fication will be removed in - the next major Automake release (1.12). + - automake now generates silenced rules for texinfo outputs. + + - The deprecated options `--output-dir', `--Werror' and `--Wno-error' + have been removed. + +* New targets: + + - New `cscope' target to build a cscope database for the source tree. + - The `--acdir' option of aclocal is deprecated, and will probably be + removed in the next major Automake release (1.12). + + * Changes to aclocal: + + - The `--acdir' option is deprecated. Now you should use th new options + `--automake-acdir' and `--system-acdir' instead. + * Miscellaneous changes: + - The `dist' and `dist-all' targets now can run compressors in parallel. + - The `lzma' compression scheme and associated automake option `dist-lzma' is obsoleted by `xz' and `dist-xz' due to upstream changes. diff --cc aclocal.in index 394aeaec0,8b31bdca4..02963eec6 --- a/aclocal.in +++ b/aclocal.in @@@ -876,9 -879,10 +878,10 @@@ sub usage ($ Generate `aclocal.m4' by scanning `configure.ac' or `configure.in' Options: - --acdir=DIR directory holding config files (for debugging) + --automake-acdir=DIR directory holding automake-provided m4 files + --system-acdir=DIR directory holding third-party system-wide files --diff[=COMMAND] run COMMAND [diff -u] on M4 files that would be - changed (implies --install and --dry-run) + changed (implies --install and --dry-run) --dry-run pretend to, but do not actually update any file --force always update output file --help print this help, then exit @@@ -1013,37 -1024,25 +1023,25 @@@ sub parse_arguments ( if ($install && !@user_includes) { fatal ("--install should copy macros in the directory indicated by the" - . "\nfirst -I option, but no -I was supplied."); + . "\nfirst -I option, but no -I was supplied"); } - if (! -d $system_includes[0]) + # Finally, adds any directory listed in the `dirlist' file. + if (open (DIRLIST, "$system_includes[0]/dirlist")) { - # By default $(datadir)/aclocal doesn't exist. We don't want to - # get an error in the case where we are searching the default - # directory and it hasn't been created. (We know - # @system_includes has its default value if @automake_includes - # is not empty, because --acdir is the only way to change this.) - @system_includes = () if @automake_includes; - } - else - { - # Finally, adds any directory listed in the `dirlist' file. - if (open (DIRLIST, "$system_includes[0]/dirlist")) - { - while () - { - # Ignore '#' lines. - next if /^#/; - # strip off newlines and end-of-line comments - s/\s*\#.*$//; - chomp; - foreach my $dir (glob) - { - push (@system_includes, $dir) if -d $dir; - } - } - close (DIRLIST); - } + while () + { + # Ignore '#' lines. + next if /^#/; + # strip off newlines and end-of-line comments + s/\s*\#.*$//; + chomp; + foreach my $dir (glob) + { + push (@system_includes, $dir) if -d $dir; + } + } + close (DIRLIST); } } diff --cc tests/Makefile.am index c3ea49abb,f01a6dda1..1814e43e6 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -130,7 -71,8 +130,9 @@@ acloca19.test acloca20.test \ acloca21.test \ acloca22.test \ +acloca23.test \ + aclocal-acdir.test \ + aclocal-print-acdir.test \ acoutnoq.test \ acoutpt.test \ acoutpt2.test \ diff --cc tests/Makefile.in index d08323ea7,eed1ef90c..98bdb5ab5 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -402,7 -349,8 +402,9 @@@ acloca19.test acloca20.test \ acloca21.test \ acloca22.test \ +acloca23.test \ + aclocal-acdir.test \ + aclocal-print-acdir.test \ acoutnoq.test \ acoutpt.test \ acoutpt2.test \ diff --cc tests/aclocal-print-acdir.test index 000000000,368416caf..add1f6409 mode 000000,100755..100755 --- a/tests/aclocal-print-acdir.test +++ b/tests/aclocal-print-acdir.test @@@ -1,0 -1,35 +1,35 @@@ + #! /bin/sh + # Copyright (C) 2011 Free Software Foundation, Inc. + # + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; either version 2, or (at your option) + # any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + + # Test on aclocal's `--print-ac-dir' option. + + . ./defs || Exit 1 + + set -e + + $ACLOCAL --print-ac-dir -test "`$ACLOCAL --print-ac-dir`" = "$testaclocaldir/acdir" ++test "`$ACLOCAL --print-ac-dir`" = "$top_testsrcdir/m4" + + $ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir + test "`$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir`" = foo + + $ACLOCAL --system-acdir /bar --print-ac-dir + test "`$ACLOCAL --system-acdir /bar --print-ac-dir`" = /bar + + $ACLOCAL --automake-acdir /bar --print-ac-dir -test "`$ACLOCAL --automake-acdir /bar --print-ac-dir`" = "$testaclocaldir/acdir" ++test "`$ACLOCAL --automake-acdir /bar --print-ac-dir`" = "$top_testsrcdir/m4" + + : diff --cc tests/aclocal.test index 64b72e156,439faa95f..47c7dfa9f --- a/tests/aclocal.test +++ b/tests/aclocal.test @@@ -15,10 -15,12 +15,10 @@@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . - # Test to make sure that aclocal --output works. Report from - # Alexandre Oliva. + # Test on some aclocal options. Report from Alexandre Oliva. + . ./defs || Exit 1 -set -e - $ACLOCAL --output=fred test -f fred