-AC_DEFUN(RFX_CHECK_PYTHON,
+AC_DEFUN([RFX_CHECK_PYTHON],
[
AC_MSG_CHECKING([for Python.h])
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
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"
- 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_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" \
fi
if test "x$PY_VERSION" "!=" "x"; then
- AC_MSG_RESULT($PY_VERSION)
+ AC_MSG_RESULT([$PY_VERSION])
export PYTHON_INCLUDES PYTHON_LIB
AC_SUBST(PYTHON_LIB)
AC_SUBST(PYTHON_INCLUDES)
ac_link='$CC $CPPFLAGS $CFLAGS $PYTHON_INCLUDES conftest.c $LDFLAGS ${PYTHON_LIB2} $LIBS -o conftest${ac_exeext}'
if { (eval echo python.m4: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
PYTHON_LIB="${PYTHON_LIB2}"
- AC_DEFINE_UNQUOTED(HAVE_PYTHON_IMAGING, 1)
+ AC_DEFINE([HAVE_PYTHON_IMAGING], [1], [whether python-imaging was found])
HAVE_PYTHON_IMAGING=yes
export HAVE_PYTHON_IMAGING
AC_SUBST(HAVE_PYTHON_IMAGING)
fi
rm -f conftest*
else
- AC_MSG_RESULT(nope)
+ AC_MSG_RESULT([nope])
fi
])