From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 21 Nov 2012 13:13:02 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v1.12b~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb6a19d9d0c46ddf03b2494333bed2c3d7dc1e15;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  tests: fix a spurious failure when $PYTHON is in the environment
  python tests: support PEP-3147 installation layout
  python: uninstall cater to PEP-3147
  tests: improve a comment
  tests: honour $PYTHON override
  tests: typofix in message
  news: document fix for bug#8847 (PEP-3147, __pycache__)
  python: improve support for modern python (CPython 3.2 and PyPy)

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

cb6a19d9d0c46ddf03b2494333bed2c3d7dc1e15
diff --cc t/python11.sh
index e3e29e5f7,a22826c6d..a648c7b33
--- a/t/python11.sh
+++ b/t/python11.sh
@@@ -17,8 -17,11 +17,11 @@@
  # Test missing python.
  
  # Python is not required for this test.
 -. ./defs || exit 1
 +. test-init.sh
  
+ # We don't want to allow user overrides in this test.
+ PYTHON=; unset PYTHON
+ 
  cat >>configure.ac <<'EOF'
  m4_define([_AM_PYTHON_INTERPRETER_LIST], [IShouldNotExist1 IShouldNotExist2])
  AM_PATH_PYTHON