From: Stefano Lattarini Date: Tue, 20 Sep 2011 18:47:41 +0000 (+0200) Subject: Merge branch 'master' into test-protocols X-Git-Tag: ng-0.5a~89^2~38^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f64cc0d2b2ac5d3579c1916a10999561d2a36a58;p=thirdparty%2Fautomake.git Merge branch 'master' into test-protocols * master: docs: remove mention of deprecated option `--acdir' fix: cleanup NEWS after botched merges fix: typo in NEWS docs: document planned precedence changes in aclocal search path aclocal: handle ACLOCAL_PATH environment variable tests: fix spurious failure in 'primary-prefix-valid-couples.test' docs: deprecate JAVA primary docs: clearer distinction between `.java' with javac and with gcj java: complain if java_JAVA is used but $(javadir) is undefined --- f64cc0d2b2ac5d3579c1916a10999561d2a36a58 diff --cc ChangeLog index 856c92f39,d89b28071..40587c7dc --- a/ChangeLog +++ b/ChangeLog @@@ -1,9 -1,91 +1,97 @@@ + 2011-09-20 Stefano Lattarini + + docs: remove mention of deprecated option `--acdir' + * doc/automake.texi (aclocal Options): Remove mention of + deprecated `--acdir' option. + + 2011-09-20 Stefano Lattarini + + * NEWS: Cleanup after botched merges. + + 2011-09-20 Stefano Lattarini + + * NEWS: Fix typo. + + 2011-09-20 Stefano Lattarini + + docs: document planned precedence changes in aclocal search path + * doc/automake.texi (Macro Search Path): Explicitly state that the + lookup order for extra directories of `.m4' files will be changed + in the next major release. + * NEWS: Likewise. + + 2011-09-19 Paolo Bonzini + Stefano Lattarini + + aclocal: handle ACLOCAL_PATH environment variable + * aclocal.in (parse_ACLOCAL_PATH): New function, parse ACLOCAL_PATH + as a colon-separated list of directories to be included in the + search path. + * doc/automake.texi (Macro Search Path): Document new behavior and + the precedence rules for various elements of the search path. + * tests/aclocal-path.test: New test. + * tests/aclocal-path-install.test: Likewise. + * tests/aclocal-path-install-serial.test: Likewise. + * tests/aclocal-path-precedence.test: Likewise. + * tests/aclocal-path-nonexistent.test: Likewise. + * tests/Makefile.am (TESTS): Add them. + * NEWS: Update. + * tests/distcheck-missing-m4.test: Extend by also checking + interactions with ACLOCAL_PATH. + * tests/distcheck-outdated-m4.test: Likewise, and fix a couple + of botched comments since we are at it. + + 2011-09-19 Stefano Lattarini + + tests: fix spurious failure in 'primary-prefix-valid-couples.test' + * tests/primary-prefix-valid-couples.test: After commit + v1.11-464-gc9dfc36, `java_JAVA' is not a valid prefix/primary + combination by default anymore: one has to explicitly define + $(javadir) to make it so. So just drop `java_JAVA' from our + Makefile.am Also, since we are at it, ... + (configure.in): ... remove AM_PROG_GCJ from here, as it's not + really required. + + 2011-09-19 Stefano Lattarini + + docs: deprecate JAVA primary + * doc/automake.texi (Java): Deprecate the JAVA primary, stating + that it will become obsolete in automake 1.12 and probably removed + altogether in automake 1.13. Reflect this in the section title, + by appending the string "(deprecated feature)". + (@menu, @detailmenu): Update. + (Java Support with gcj): The cross-referenced support for bytecode + compilation with the JAVA primary is rudimentary and deprecated. + State that explicitly. + + 2011-09-19 Stefano Lattarini + + docs: clearer distinction between `.java' with javac and with gcj + * doc/automake.texi (Java support): Rename this node ... + (Java support with gcj): ... to this, and change its title from + "Compiling Java sources" to "Compiling Java sources using gcj". + (@detailmenu, @menu, @cindex): Update and make more precise. + (Java): Change the title of this node from simply "Java" to + "Java bytecode compilation". + (@detailmenu, @menu, @cindex): Update and make more precise. + + 2011-09-18 Stefano Lattarini + + java: complain if java_JAVA is used but $(javadir) is undefined + Fixes automake bug#8461. + * automake.in (handle_java): Remove inappropriate "java" argument + from the calls to `&am_install_var' and `&am_primary_prefixes'. + * tests/instdir-java.test (Makefile.am): Define `$(javadir)'. + * tests/javadir-undefined.test: New test. + * tests/Makefile.am (TESTS): Add it. + * NEWS: Update. + +2011-09-18 Stefano Lattarini + + parallel-tests: expose automake bug#9546 + * tests/test-driver-is-distributed.test: New test. + * tests/Makefile.am (TESTS, XFAIL_TESTS): Add it. + 2011-09-16 Stefano Lattarini automake: remove special handling of `ANSI2KNR' make variable diff --cc tests/Makefile.am index 2e7e17f1c,dd2acdee7..632197fb4 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -138,9 -132,19 +138,14 @@@ acloca20.test acloca21.test \ acloca22.test \ acloca23.test \ - ac-output-old.tap \ aclocal-acdir.test \ aclocal-print-acdir.test \ + aclocal-path.test \ + aclocal-path-install.test \ + aclocal-path-install-serial.test \ + aclocal-path-nonexistent.test \ + aclocal-path-precedence.test \ -acoutnoq.test \ -acoutpt.test \ -acoutpt2.test \ -acoutqnl.test \ -acoutbs.test \ -acoutbs2.test \ ++ac-output-old.tap \ acsilent.test \ acsubst.test \ acsubst2.test \ diff --cc tests/Makefile.in index 82483306c,d15170589..82040e9ee --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -396,9 -403,19 +396,14 @@@ acloca20.test acloca21.test \ acloca22.test \ acloca23.test \ - ac-output-old.tap \ aclocal-acdir.test \ aclocal-print-acdir.test \ + aclocal-path.test \ + aclocal-path-install.test \ + aclocal-path-install-serial.test \ + aclocal-path-nonexistent.test \ + aclocal-path-precedence.test \ -acoutnoq.test \ -acoutpt.test \ -acoutpt2.test \ -acoutqnl.test \ -acoutbs.test \ -acoutbs2.test \ ++ac-output-old.tap \ acsilent.test \ acsubst.test \ acsubst2.test \