e74bb2d7f0
relax python 2.6 dependency fix regress prodded by and ok jasper@
50 lines
2.4 KiB
Plaintext
50 lines
2.4 KiB
Plaintext
$OpenBSD: patch-configure,v 1.4 2009/09/04 11:44:00 eric Exp $
|
|
--- configure.orig Wed Aug 26 13:04:28 2009
|
|
+++ configure Fri Sep 4 10:48:36 2009
|
|
@@ -11107,13 +11107,13 @@ CC="$lt_save_CC"
|
|
|
|
if test -n "$PYTHON"; then
|
|
# If the user set $PYTHON, use it and don't search something else.
|
|
- { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.6" >&5
|
|
-$as_echo_n "checking whether $PYTHON version >= 2.6... " >&6; }
|
|
+ { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.5" >&5
|
|
+$as_echo_n "checking whether $PYTHON version >= 2.5... " >&6; }
|
|
prog="import sys
|
|
# split strings by '.' and convert to numeric. Append some zeros
|
|
# because we need at least 4 digits for the hex conversion.
|
|
# map returns an iterator in Python 3.0 and a list in 2.x
|
|
-minver = list(map(int, '2.6'.split('.'))) + [0, 0, 0]
|
|
+minver = list(map(int, '2.5'.split('.'))) + [0, 0, 0]
|
|
minverhex = 0
|
|
# xrange is not present in Python 3.0 and range returns an iterator
|
|
for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
|
|
@@ -11135,8 +11135,8 @@ fi
|
|
else
|
|
# Otherwise, try each interpreter until we find one that satisfies
|
|
# VERSION.
|
|
- { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.6" >&5
|
|
-$as_echo_n "checking for a Python interpreter with version >= 2.6... " >&6; }
|
|
+ { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.5" >&5
|
|
+$as_echo_n "checking for a Python interpreter with version >= 2.5... " >&6; }
|
|
if test "${am_cv_pathless_PYTHON+set}" = set; then
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
@@ -11147,7 +11147,7 @@ else
|
|
# split strings by '.' and convert to numeric. Append some zeros
|
|
# because we need at least 4 digits for the hex conversion.
|
|
# map returns an iterator in Python 3.0 and a list in 2.x
|
|
-minver = list(map(int, '2.6'.split('.'))) + [0, 0, 0]
|
|
+minver = list(map(int, '2.5'.split('.'))) + [0, 0, 0]
|
|
minverhex = 0
|
|
# xrange is not present in Python 3.0 and range returns an iterator
|
|
for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
|
|
@@ -11321,7 +11321,7 @@ $as_echo "$am_cv_python_pyexecdir" >&6; }
|
|
# Checks for libraries ---
|
|
|
|
# get rid of the -export-dynamic stuff from the configure flags ...
|
|
-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
|
|
+export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | SED=/usr/bin/sed sh`
|
|
|
|
# cairo
|
|
|