From: Stefano Lattarini Date: Tue, 20 Sep 2011 18:16:43 +0000 (+0200) Subject: Merge branch 'maint' X-Git-Tag: v1.11b~287 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f80364582061d4bb13b74de9cd1ad35556a7afe;p=platform%2Fupstream%2Fautomake.git Merge branch 'maint' * maint: 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 --- 8f80364582061d4bb13b74de9cd1ad35556a7afe diff --cc ChangeLog index 521ca9f,2f58f1b..6d8c45e --- a/ChangeLog +++ b/ChangeLog @@@ -1,9 -1,77 +1,83 @@@ + 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-16 Stefano Lattarini + + automake: remove special handling of `ANSI2KNR' make variable + * automake.in (define_configure_variable): Remove special-cased + handling of `ANSI2KNR' variable. Related minor simplifications. + 2011-09-12 Stefano Lattarini cosmetics: fix various typos and grammaros diff --cc NEWS index 08a56c0,7ab3f07..2b47eea --- a/NEWS +++ b/NEWS @@@ -19,10 -17,13 +23,15 @@@ New in 1.11a - The `--acdir' option is deprecated. Now you should use th new options `--automake-acdir' and `--system-acdir' instead. + - The `ACLOCAL_PATH' environment variable is now interpreted as a + colon-separated list of additional directories to search after the + automake internal acdir (by default ${prefix}/share/aclocal-APIVERSION) + and before the system acdir (by default ${prefix}/share/aclocal). + * 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 automake.in index fa21996,215881b..5a44f3a mode 100644,100755..100644 --- a/automake.in +++ b/automake.in diff --cc doc/automake.texi index 2f81c10,a8233dd..68995d9 --- a/doc/automake.texi +++ b/doc/automake.texi @@@ -230,9 -230,10 +230,9 @@@ Building Programs and Librarie * Assembly Support:: Compiling assembly sources * Fortran 77 Support:: Compiling Fortran 77 sources * Fortran 9x Support:: Compiling Fortran 9x sources - * Java Support:: Compiling Java sources + * Java Support with gcj:: Compiling Java sources using gcj * Vala Support:: Compiling Vala sources * Support for Other Languages:: Compiling other languages -* ANSI:: Automatic de-ANSI-fication (deprecated, soon to be removed) * Dependencies:: Automatic dependency tracking * EXEEXT:: Support for executable extensions @@@ -4621,9 -4661,10 +4655,9 @@@ to build programs and libraries * Assembly Support:: Compiling assembly sources * Fortran 77 Support:: Compiling Fortran 77 sources * Fortran 9x Support:: Compiling Fortran 9x sources - * Java Support:: Compiling Java sources + * Java Support with gcj:: Compiling Java sources using gcj * Vala Support:: Compiling Vala sources * Support for Other Languages:: Compiling other languages -* ANSI:: Automatic de-ANSI-fication (deprecated, soon to be removed) * Dependencies:: Automatic dependency tracking * EXEEXT:: Support for executable extensions @end menu diff --cc tests/Makefile.am index d53f867,1d258c9..dd2acde --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -131,9 -72,13 +131,14 @@@ acloca19.test acloca20.test \ acloca21.test \ acloca22.test \ +acloca23.test \ 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 \ @@@ -540,17 -457,13 +545,18 @@@ java.test java2.test \ java3.test \ java-check.test \ +java-clean.test \ java-empty-classpath.test \ + javadir-undefined.test \ javaprim.test \ javasubst.test \ -java-clean.test \ +javaflags.test \ +java-extra.test \ +java-noinst.test \ java-nobase.test \ java-compile-install.test \ +java-compile-run-flat.test \ +java-compile-run-nested.test \ java-sources.test \ java-no-duplicate.test \ java-mix.test \ diff --cc tests/Makefile.in index 566f39d,7e9bc20..d151705 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -402,9 -350,13 +402,14 @@@ acloca19.test acloca20.test \ acloca21.test \ acloca22.test \ +acloca23.test \ 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 \ @@@ -811,17 -735,13 +816,18 @@@ java.test java2.test \ java3.test \ java-check.test \ +java-clean.test \ java-empty-classpath.test \ + javadir-undefined.test \ javaprim.test \ javasubst.test \ -java-clean.test \ +javaflags.test \ +java-extra.test \ +java-noinst.test \ java-nobase.test \ java-compile-install.test \ +java-compile-run-flat.test \ +java-compile-run-nested.test \ java-sources.test \ java-no-duplicate.test \ java-mix.test \