6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
authorRich Burridge <rich.burridge@oracle.com>
Fri, 28 Oct 2011 07:39:46 -0700
changeset 553 29d0b0e1eaef
parent 552 540527b8254a
child 554 0ed48135019d
6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
components/automake/automake-1.10/patches/python.m4.patch
components/automake/automake-1.9.6/patches/python.m4.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/automake/automake-1.10/patches/python.m4.patch	Fri Oct 28 07:39:46 2011 -0700
@@ -0,0 +1,21 @@
+--- automake-1.10/m4/python.m4.orig	Wed Oct 19 08:27:01 2011
++++ automake-1.10/m4/python.m4	Wed Oct 19 08:28:39 2011
[email protected]@ -34,13 +34,12 @@
+ # numbers and dots only.
+ AC_DEFUN([AM_PATH_PYTHON],
+  [
+-  dnl Find a Python interpreter.  Python versions prior to 1.5 are not
+-  dnl supported because the default installation locations changed from
+-  dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
+-  dnl in 1.5.
++  dnl Find a Python interpreter.  Python versions prior to 2.0 are not
++  dnl supported. (2.0 was released on October 16, 2000).
+   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
+-                    [python python2 python2.5 python2.4 python2.3 python2.2 dnl
+-python2.1 python2.0 python1.6 python1.5])
++                    [python python2 python3 python3.2 python3.1 python3.0 dnl
++python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
++python2.0])
+ 
+   m4_if([$1],[],[
+     dnl No version check is needed.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/automake/automake-1.9.6/patches/python.m4.patch	Fri Oct 28 07:39:46 2011 -0700
@@ -0,0 +1,21 @@
+--- automake-1.9.6/m4/python.m4.orig	Wed Oct 19 08:25:00 2011
++++ automake-1.9.6/m4/python.m4	Wed Oct 19 08:25:30 2011
[email protected]@ -34,13 +34,12 @@
+ # numbers and dots only.
+ AC_DEFUN([AM_PATH_PYTHON],
+  [
+-  dnl Find a Python interpreter.  Python versions prior to 1.5 are not
+-  dnl supported because the default installation locations changed from
+-  dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
+-  dnl in 1.5.
++  dnl Find a Python interpreter.  Python versions prior to 2.0 are not
++  dnl supported. (2.0 was released on October 16, 2000).
+   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
+-                    [python python2 python2.5 python2.4 python2.3 python2.2 dnl
+-python2.1 python2.0 python1.6 python1.5])
++                    [python python2 python3 python3.2 python3.1 python3.0 dnl
++python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
++python2.0])
+ 
+   m4_if([$1],[],[
+     dnl No version check is needed.