[FYI] {master} news: sync with branch-1.11, fix mis-merges

[Stefano Lattarini]

Signed-off-by: Stefano Lattarini <address@hidden>
---
 NEWS |  175 +++++++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 99 insertions(+), 76 deletions(-)

diff --git a/NEWS b/NEWS
index 48d1c52..0a38d1d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+New in 1.11a:
+
 * WARNING: Future backward-incompatibilities!
 
   - Starting from the next major Automake version (1.13), the parallel
@@ -46,8 +48,6 @@
     search path are looked up is probably going to be changed in the
     next Automake release (1.13).
 
-New in 1.11a:
-
 * Obsolete features removed:
 
   - The never documented nor truly used script 'acinstall' has been
@@ -199,25 +199,10 @@ New in 1.11a:
     avoid time stamp issues with makefile rules rerunning autotools
     programs.
 
-  - For programs and libraries, automake now detect EXTRA_foo_DEPENDENCIES
-    and adds them to the normal list of dependencies, but without
-    overwriting the foo_DEPENDENCIES variable, which is normally computed
-    by automake.
-
   - The warnings in the category 'extra-portability' are now enabled by
     '-Wall'.  In previous versions, one has to use '-Wextra-portability'
     to enable them.
 
-  - The 'ar-lib' script now ignores the "s" (symbol index) and "S" (no
-    symbol index) modifiers as well as the "s" action, as the symbol index
-    is created unconditionally by Microsoft lib.  Also, the "q" (quick)
-    action is now a synonym for "r" (replace).  Also, the script has been
-    ignoring the "v" (verbose) modifier already since Automake 1.11.3.
-
-  - When the 'compile' script is used to wrap MSVC, it now accepts an
-    optional space between the -I, -L and -l options and their respective
-    arguments, for better POSIX compliance.
-
 Bugs fixed in 1.11a:
 
   - Various minor bugfixes for recent or long-standing bugs.
@@ -235,11 +220,6 @@ Bugs fixed in 1.11a:
 
 * Long-standing bugs:
 
-  - It is now possible for a foo_SOURCES variable to hold Vala sources
-    together with C header files, as well as with sources and headers for
-    other supported languages (e.g., C++).  Previously, only mixing C and
-    Vala sources was supported.
-
   - Automake's own build system finally have a real "installcheck" target.
 
   - Files listed with the AC_REQUIRE_AUX_FILE macro in configure.ac are
@@ -266,18 +246,52 @@ Bugs fixed in 1.11a:
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-New in 1.11.3:
+New in 1.11.4:
 
 * WARNING: Future backward-incompatibilities!
 
-  - The obsolescent AM_WITH_REGEX  macro has been deprecated, since the
-    GNU rx library has been decommissioned.
+  - The support for the "obscure" multilib feature has been deprecated,
+    and will be moved out of the automake core in the next major Automake
+    release (1.12).
+
+  - The support for ".log -> .html" conversion and the check-html and
+    recheck-html targets will be removed in the next major Automake
+    release (1.12).
+
+  - The obsolescent AM_WITH_REGEX  macro has been deprecated (since the
+    GNU rx library has been decommissioned), and will be removed in the
+    next major Automake release (1.12).
 
   - The `lzma' compression format for distribution archives has been
-    deprecated in favor of `xz' and `lzip'.
+    deprecated in favor of `xz' and `lzip', and will be removed in the
+    next major Automake release (1.12).
+
+  - The `--acdir' option of aclocal is deprecated, and will probably be
+    removed in the next major Automake release (1.12).
+
+  - The exact order in which the directories in the aclocal macro
+    search path are looked up is probably going to be changed in the
+    next Automake release (1.12).
+
+  - The Automake support for automatic de-ANSI-fication will be removed
+    in the next major Automake release (1.12).
+
+  - Starting from the next Automake release (1.12), warnings in the
+    `extra-portability' category will be enabled by `-Wall' (right now,
+    one has to use `-Wextra-portability' explicitly).
 
 * Miscellaneous changes:
 
+  - The 'ar-lib' script now ignores the "s" (symbol index) and "S" (no
+    symbol index) modifiers as well as the "s" action, as the symbol index
+    is created unconditionally by Microsoft lib.  Also, the "q" (quick)
+    action is now a synonym for "r" (replace).  Also, the script has been
+    ignoring the "v" (verbose) modifier already since Automake 1.11.3.
+
+  - When the 'compile' script is used to wrap MSVC, it now accepts an
+    optional space between the -I, -L and -l options and their respective
+    arguments, for better POSIX compliance.
+
   - There is an initial, experimental support for automatic dependency
     tracking with tcc (the Tiny C Compiler).  Its associated depmode is
     currently recognized as "icc" (but this and other details are likely
@@ -286,6 +300,46 @@ New in 1.11.3:
   - Automatic dependency tracking now works also with the IBM XL C/C++
     compilers, thanks to the new new depmode 'xlc'.
 
+Bugs fixed in 1.11.4:
+
+* Bugs introduced by 1.11.2:
+
+  - A definition of 'noinst_PYTHON' before 'python_PYTHON' (or similar)
+    don't cause spurious failures upon "make install" anymore.
+
+  - The user can now instruct the 'uninstall-info' rule not to update
+    the '${infodir}/dir' file by exporting the environment variable
+    'AM_UPDATE_INFO_DIR' to the value "no".  This is done for consistency
+    with how the 'install-info' rule operates since automake 1.11.2.
+
+* Long-standing bugs:
+
+  - It is now possible for a foo_SOURCES variable to hold Vala sources
+    together with C header files, as well as with sources and headers for
+    other supported languages (e.g., C++).  Previously, only mixing C and
+    Vala sources was supported.
+
+  - If "aclocal --install" is used, and the first directory specified with
+    '-I' is non-existent, aclocal will now create it before trying to copy
+    files in it.
+
+  - An empty declaration of a "foo_PRIMARY" don't cause anymore the
+    generated install rules to create an empty $(foodir) directory;
+    for example, if Makefile.am contains something like:
+
+      pkglibexec_SCRIPTS =
+      if FALSE
+      pkglibexec_SCRIPTS += bar.sh
+      endif
+
+    the $(pkglibexec) directory will not be created upon "make install".
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 1.11.3:
+
+* Miscellaneous changes:
+
   - Automake's own build system is more silent by default, making use of
     the 'silent-rules' option.
 
@@ -313,8 +367,22 @@ New in 1.11.3:
   - The last relics of Python 1.5 support have been removed from the
     AM_PATH_PYTHON macro.
 
+  - For programs and libraries, automake now detects EXTRA_foo_DEPENDENCIES
+    and adds them to the normal list of dependencies, but without
+    overwriting the foo_DEPENDENCIES variable, which is normally computed
+    by automake.
+
 Bugs fixed in 1.11.3:
 
+* Bugs introduced by 1.11.2:
+
+  - Automake now correctly recognizes the prefix/primary combination
+   `pkglibexec_SCRIPTS' as valid.
+
+  - The parallel-tests harness doesn't trip anymore on sed implementations
+    with stricter limits on the length of input lines (problem seen at
+    least on Solaris 8).
+
 * Long-standing bugs:
 
   - The "deleted header file problem" for *.am files is avoided by stub
@@ -347,7 +415,8 @@ New in 1.11.2:
 * Miscellaneous changes:
 
   - The Automake support for automatic de-ANSI-fication has been
-    deprecated.
+    deprecated.  It will probably be removed in the next major Automake
+    release (1.12).
 
   - The `lzma' compression scheme and associated automake option `dist-lzma'
     is obsoleted by `xz' and `dist-xz' due to upstream changes.
@@ -382,36 +451,11 @@ New in 1.11.2:
     file generated by automake-provided rules by defining the special make
     variable `$(EXTRA_DEJAGNU_SITE_CONFIG)'.
 
-  - The `install-info' and `uninstall-info' rules can now be instructed
-    not to create/update the `${infodir}/dir' file, by exporting the new
-    environment variable `AM_UPDATE_INFO_DIR' to the value "no".
+  - The `install-info' rule can now be instructed not to create/update
+    the `${infodir}/dir' file, by exporting the new environment variable
+    `AM_UPDATE_INFO_DIR' to the value "no".
 
 Bugs fixed in 1.11.2:
-  - For programs and libraries, automake now detects EXTRA_foo_DEPENDENCIES
-    and adds them to the normal list of dependencies, but without
-    overwriting the foo_DEPENDENCIES variable, which is normally computed
-    by automake.
-
-  - The 'ar-lib' script now ignores the "s" (symbol index) and "S" (no
-    symbol index) modifiers as well as the "s" action, as the symbol index
-    is created unconditionally by Microsoft lib.  Also, the "q" (quick)
-    action is now a synonym for "r" (replace).  Also, the script has been
-    ignoring the "v" (verbose) modifier already since Automake 1.11.3.
-
-  - When the 'compile' script is used to wrap MSVC, it now accepts an
-    optional space between the -I, -L and -l options and their respective
-    arguments, for better POSIX compliance.
-
-  - If "aclocal --install" is used, and the first directory specified with
-    '-I' is non-existent, aclocal will now create it before trying to copy
-    files in it.
-
-Bugs fixed in 1.11.0a:
-
-* Bugs introduced by 1.11.2:
-
-  - Automake now correctly recognizes the prefix/primary combination
-   `pkglibexec_SCRIPTS' as valid.
 
 * Bugs introduced by 1.11:
 
@@ -441,27 +485,6 @@ Bugs fixed in 1.11.0a:
   - The order of Yacc and Lex flags is fixed to be consistent with other
     languages: $(AM_YFLAGS) comes before $(YFLAGS), and $(AM_LFLAGS) before
     $(LFLAGS), so that the user variables override the developer variables.
-  - An empty declaration of a "foo_PRIMARY" don't cause anymore the
-    generated install rules to create an empty $(foodir) directory;
-    for example, if Makefile.am contains something like:
-
-      pkglibexec_SCRIPTS =
-      if FALSE
-      pkglibexec_SCRIPTS += bar.sh
-      endif
-
-    the $(pkglibexec) directory will not be created upon "make install".
-
-  - It is now possible for a foo_SOURCES variable to hold Vala sources
-    together with C header files, as well as with sources and headers for
-    other supported languages (e.g., C++).  Previously, only mixing C and
-    Vala sources was supported.
-
-  - Vala support now works better in VPATH setups.
-
-  - The "deleted header file problem" for *.am files is avoided by stub
-    rules.  This allows `make' to trigger a rerun of `automake' also if
-    some previously needed `.am' file has been removed.
 
   - "make distcheck" now correctly complains also when "make uninstall"
     leaves one and only one file installed in $(prefix).
-- 
1.7.9