From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 3 Jan 2012 21:57:49 +0000 (+0100)
Subject: Merge branch 'maint' into branch-1.11
X-Git-Tag: v1.11.2b~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a2997632676d53873db02ec892daea12d2a5ad7;p=platform%2Fupstream%2Fautomake.git

Merge branch 'maint' into branch-1.11

* maint:
  install: pkglibexec_SCRIPTS is a valid prefix/primary combination
  coverage: expose automake bug#10128
  progs, libs: implement EXTRA_foo_DEPENDENCIES
  tests: fix spurious failures in 'pr300*.test'
---

5a2997632676d53873db02ec892daea12d2a5ad7
diff --cc NEWS
index fb929f5,2e572e4..58b2573
--- a/NEWS
+++ b/NEWS
@@@ -40,40 -46,6 +40,50 @@@ New in 1.11.2a
    - 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.2a:
 +
++* Bugs introduced by 1.11.2:
++
++  - Automake now correctly recognizes the prefix/primary combination
++   `pkglibexec_SCRIPTS' as valid.
++
 +* Long-standing bugs:
 +
 +  - 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.
 +
 +  - The `silent-rules' option now generates working makefiles even
 +    for the uncommon `make' implementations that do not support the
 +    nested-variables extension to POSIX 2008.  For such `make'
 +    implementations, whether a build is silent is determined at
 +    configure time, and cannot be overridden at make time with
 +    `make V=0' or `make V=1'.
 +
 +
 +New in 1.11.2:
 +
 +* Changes to aclocal:
 +
 +  - The `--acdir' option is deprecated.  Now you should use the 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 Automake support for automatic de-ANSI-fication has been
 +    deprecated.  I 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.
  
diff --cc tests/Makefile.am
index 52b5114,ff56442..ab7f2b4
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -402,9 -388,8 +404,11 @@@ extra8.test 
  extra10.test \
  extra11.test \
  extra12.test \
+ extradep.test \
+ extradep2.test \
 +extra-portability.test \
 +extra-portability2.test \
 +extra-portability3.test \
  f90only.test \
  flavor.test \
  flibs.test \
diff --cc tests/pr300-lib.test
index e10be24,8f96db1..d2ea942
--- a/tests/pr300-lib.test
+++ b/tests/pr300-lib.test
@@@ -45,9 -45,14 +45,14 @@@ EN
  
  $ACLOCAL
  $AUTOCONF
 -$AUTOMAKE --copy --add-missing
 +$AUTOMAKE -Wno-extra-portability --copy --add-missing
  
- ./configure --prefix "`pwd`/inst"
+ # We pass '--libdir' explicitly, to avoid spurious failures due to users
+ # or distributions possibly overriding '${libdir}' in their $CONFIG_SITE
+ # file (for example, defining it to '${prefix}/lib64' on 64-bit systems,
+ # as is the case with openSUSE 12.1).  See automake bug#10426.
+ cwd=`pwd` || Exit 99
+ ./configure --prefix "$cwd/inst" --libdir "$cwd/inst/lib"
  
  $MAKE
  
diff --cc tests/pr300-ltlib.test
index 5e8c052,06d3c32..6976683
--- a/tests/pr300-ltlib.test
+++ b/tests/pr300-ltlib.test
@@@ -47,9 -47,14 +47,14 @@@ EN
  libtoolize
  $ACLOCAL
  $AUTOCONF
 -$AUTOMAKE --copy --add-missing
 +$AUTOMAKE -Wno-extra-portability --copy --add-missing
  
- ./configure --prefix "`pwd`/inst"
+ # We pass '--libdir' explicitly, to avoid spurious failures due to users
+ # or distributions possibly overriding '${libdir}' in their $CONFIG_SITE
+ # file (for example, defining it to '${prefix}/lib64' on 64-bit systems,
+ # as is the case with openSUSE 12.1).  See automake bug#10426.
+ cwd=`pwd` || Exit 99
+ ./configure --prefix "$cwd/inst" --libdir "$cwd/inst/lib"
  
  $MAKE V=1 >stdout || { cat stdout; Exit 1; }
  cat stdout