Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/automake/automake-1.9.6/patches/python.m4.patch
author Rich Burridge <rich.burridge@oracle.com>
Fri, 28 Oct 2011 07:39:46 -0700
changeset 553 29d0b0e1eaef
permissions -rw-r--r--
6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
553
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     1
 
--- automake-1.9.6/m4/python.m4.orig	Wed Oct 19 08:25:00 2011
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     2
 
+++ automake-1.9.6/m4/python.m4	Wed Oct 19 08:25:30 2011
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     3
 
@@ -34,13 +34,12 @@
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     4
 
 # numbers and dots only.
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     5
 
 AC_DEFUN([AM_PATH_PYTHON],
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     6
 
  [
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     7
 
-  dnl Find a Python interpreter.  Python versions prior to 1.5 are not
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     8
 
-  dnl supported because the default installation locations changed from
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     9
 
-  dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    10
 
-  dnl in 1.5.
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    11
 
+  dnl Find a Python interpreter.  Python versions prior to 2.0 are not
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    12
 
+  dnl supported. (2.0 was released on October 16, 2000).
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    13
 
   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    14
 
-                    [python python2 python2.5 python2.4 python2.3 python2.2 dnl
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    15
 
-python2.1 python2.0 python1.6 python1.5])
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    16
 
+                    [python python2 python3 python3.2 python3.1 python3.0 dnl
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    17
 
+python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    18
 
+python2.0])
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    19
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    20
 
   m4_if([$1],[],[
29d0b0e1eaef 6835038 /usr/share/aclocal-1.10/python.m4 doesn't know about Python 2.6
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    21
 
     dnl No version check is needed.
upstream/oracle/userland-gate