git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applied getinfo_crash.patch and info_only.patch by Ricardo Pedroso
[swftools.git]
/
m4
/
python.m4
diff --git
a/m4/python.m4
b/m4/python.m4
index
53493e9
..
ce0bff2
100644
(file)
--- a/
m4/python.m4
+++ b/
m4/python.m4
@@
-8,8
+8,8
@@
else
if test "x$PYTHON_LIB" '!=' "x" -o "x$PYTHON_INCLUDES" '!=' "x";then
echo "Set both PYTHON_LIB and PYTHON_INCLUDES, or none at all"
fi
if test "x$PYTHON_LIB" '!=' "x" -o "x$PYTHON_INCLUDES" '!=' "x";then
echo "Set both PYTHON_LIB and PYTHON_INCLUDES, or none at all"
fi
- # iterate through version 2.2 to 2.5
- for v in 2 3 4 5; do
+ # iterate through version 2.2 to 2.6
+ for v in 2 3 4 5 6; do
# Linux
if test -f "/usr/include/python2.$v/Python.h";then
PY_VERSION=2.$v
# Linux
if test -f "/usr/include/python2.$v/Python.h";then
PY_VERSION=2.$v
@@
-22,17
+22,16
@@
else
fi
PYTHON_INCLUDES="-I/usr/include/python$PY_VERSION"
# Mac OS X
fi
PYTHON_INCLUDES="-I/usr/include/python$PY_VERSION"
# Mac OS X
- elif test -f "/System/Library/Frameworks/Python.framework/Versions/2.$v/include/python2.$v/Python.h";then
- #TODO: test for /System/Library/Frameworks/Python.framework/Versions/2.3/Python ?
+ elif test -f "/Library/Frameworks/Python.framework/Versions/2.$v/include/python2.$v/Python.h";then
PY_VERSION=2.$v
PYTHON_LIB="-framework Python"
PY_VERSION=2.$v
PYTHON_LIB="-framework Python"
- if test -f "/Library/Python/2.$v/PIL/_imaging.so";then
+ if test -f "/Library/Frameworks/Python.framework/Versions/2.$v/site-packages/PIL/_imaging.so";then
PYTHON_LIB2="$PYTHON_LIB /Library/Python/2.$v/PIL/_imaging.so"
HAVE_PYTHON_IMAGING_LIB=1
else
PYTHON_LIB2="$PYTHON_LIB"
fi
PYTHON_LIB2="$PYTHON_LIB /Library/Python/2.$v/PIL/_imaging.so"
HAVE_PYTHON_IMAGING_LIB=1
else
PYTHON_LIB2="$PYTHON_LIB"
fi
- PYTHON_INCLUDES="-I/System/Library/Frameworks/Python.framework/Versions/2.$v/include/python2.$v/"
+ PYTHON_INCLUDES="-I/Library/Frameworks/Python.framework/Versions/2.$v/include/python2.$v/"
# Mac OS X [Fink]:
elif test "(" -f "/sw/lib/python2.$v/config/libpython2.$v.dylib" \
-o -f "/sw/lib/python2.$v/config/libpython2.$v.a" \
# Mac OS X [Fink]:
elif test "(" -f "/sw/lib/python2.$v/config/libpython2.$v.dylib" \
-o -f "/sw/lib/python2.$v/config/libpython2.$v.a" \