AC_DEFUN(RFX_CHECK_PYTHON,
[
-AC_MSG_CHECKING([for Python.h and PIL])
+AC_MSG_CHECKING([for Python.h])
if test "x$PYTHON_LIB" '!=' "x" -a "x$PYTHON_INCLUDES" '!=' "x";then
PY_VERSION=unknown
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.4
- for v in 2 3 4; do
+ # iterate through version 2.2 to 2.5
+ for v in 2 3 4 5; do
# Linux
- if test -f "/usr/lib/python2.$v/site-packages/PIL/_imaging.so" -a -f "/usr/include/python2.$v/Python.h";then
+ if test -f "/usr/include/python2.$v/Python.h";then
PY_VERSION=2.$v
- PYTHON_LIB="-lpython$PY_VERSION /usr/lib/python$PY_VERSION/site-packages/PIL/_imaging.so"
+ PYTHON_LIB="-lpython$PY_VERSION"
+ if test -f "/usr/lib/python2.$v/site-packages/PIL/_imaging.so";then
+ PYTHON_LIB2="$PYTHON_LIB /usr/lib/python2.$v/site-packages/PIL/_imaging.so"
+ HAVE_PYTHON_IMAGING_LIB=1
+ else
+ PYTHON_LIB2="$PYTHON_LIB"
+ fi
PYTHON_INCLUDES="-I/usr/include/python$PY_VERSION"
- fi
# Mac OS X
- if test -f "/Library/Python/2.$v/PIL/_imaging.so" \
- -a "/System/Library/Frameworks/Python.framework/Versions/2.$v/include/python2.$v/Python.h";then
+ 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 ?
PY_VERSION=2.$v
- #PYTHON_LIB="-lpython$PY_VERSION /Library/Python/2.$v/PIL/_imaging.so"
- PYTHON_LIB="-framework Python /Library/Python/2.$v/PIL/_imaging.so"
+ PYTHON_LIB="-framework Python"
+ if test -f "/Library/Python/2.$v/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/"
+ # 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" \
+ -o -f "/sw/lib/python2.$v/config/libpython2.$v.so" \
+ ")" \
+ -a -f "/sw/include/python2.$v/Python.h"; then
+ PY_VERSION=2.$v
+ PYTHON_LIB="-L /sw/lib/python2.$v/config/ -lpython$PY_VERSION /sw/lib/python2.$v/site-packages/PIL/_imaging.so"
+ if test -f "/sw/lib/python2.$v/site-packages/PIL/_imaging.so";then
+ PYTHON_LIB2="$PYTHON_LIB /sw/lib/python2.$v/site-packages/PIL/_imaging.so"
+ HAVE_PYTHON_IMAGING_LIB=1
+ else
+ PYTHON_LIB2="$PYTHON_LIB"
+ fi
+ PYTHON_INCLUDES="-I /sw/include/python2.$v/"
fi
done
fi
cat > conftest.c << EOF
#include <Python.h>
-#include <Imaging.h>
int main()
{
return ret;
}
EOF
+
ac_link='$CC $CPPFLAGS $CFLAGS $PYTHON_INCLUDES conftest.c $LDFLAGS $PYTHON_LIB $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
AC_MSG_RESULT(yes)
PYTHON_OK=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.c >&5
- AC_MSG_RESULT(no)
+ echo "configure: failed program was:" >&5
+ cat conftest.c >&5
+ AC_MSG_RESULT(no)
+ fi
+ rm -f conftest*
+ if test "x$PYTHON_OK" = "xyes";then
+ AC_MSG_CHECKING([for Python-Imaging])
+ cat > conftest.c << EOF
+#include <Python.h>
+#include <Imaging.h>
+
+int main()
+{
+ Py_Main(0, 0);
+ return 0;
+}
+EOF
+ if test "$HAVE_PYTHON_IMAGING_LIB"; then
+ 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)
+ HAVE_PYTHON_IMAGING=yes
+ export HAVE_PYTHON_IMAGING
+ AC_SUBST(HAVE_PYTHON_IMAGING)
+ AC_MSG_RESULT(yes)
+ else
+ echo "configure: failed program was:" >&5
+ cat conftest.c >&5
+ AC_MSG_RESULT(no)
+ fi
+ else
+ echo "(didn't find the Python-Imaging libraries)" >&5
+ AC_MSG_RESULT(no)
+ fi
fi
rm -f conftest*
else