X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=m4%2Fpython.m4;h=4d675c79efe17d94bca52de0e8b87330459db0f4;hb=6971f4701464b8dda52062134ac9ef03a984ae41;hp=ac535522567bb827658cf1a8cac512dd6cee1d7f;hpb=8b255033a90c323dde6d0e13ba1ab6c5808b6dfe;p=swftools.git

diff --git a/m4/python.m4 b/m4/python.m4
index ac53552..4d675c7 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -1,25 +1,33 @@
 AC_DEFUN(RFX_CHECK_PYTHON,
 [
 AC_MSG_CHECKING([for Python.h and PIL])
-# should we support python versions below 2.2?
-if test -f "/usr/lib/python2.2/site-packages/PIL/_imaging.so" -a -f "/usr/include/python2.2/Python.h";then
-    PY_VERSION=2.2
-fi
-if test -f "/usr/lib/python2.3/site-packages/PIL/_imaging.so" -a -f "/usr/include/python2.3/Python.h";then
-    PY_VERSION=2.3
-fi
-if test -f "/usr/lib/python2.4/site-packages/PIL/_imaging.so" -a -f "/usr/include/python2.4/Python.h";then
-    PY_VERSION=2.4
+
+if test "x$PYTHON_LIB" '!=' "x" -a "x$PYTHON_INCLUDES" '!=' "x";then
+    PY_VERSION=unknown
+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
+    # iterate through version 2.2 to 2.4
+    for v in 2 3 4; do
+        # Linux
+        if test -f "/usr/lib/python2.$v/site-packages/PIL/_imaging.so" -a -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_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
+            PY_VERSION=2.$v
+            PYTHON_LIB="-lpython$PY_VERSION /Library/Python/2.$v/PIL/_imaging.so"
+            PYTHON_INCLUDES="-I/System/Library/Frameworks/Python.framework/Versions/2.$v/include/python2.$v/"
+        fi
+    done
 fi
 
 if test "x$PY_VERSION" "!=" "x"; then
-    AC_MSG_RESULT(python$PY_VERSION)
-    if test "x$PYTHON_LIB" = "x";then
-	PYTHON_LIB="-lpython$PY_VERSION /usr/lib/python$PY_VERSION/site-packages/PIL/_imaging.so"
-    fi
-    if test "x$PYTHON_INCLUDES" = "x";then
-	PYTHON_INCLUDES="-I/usr/include/python$PY_VERSION"
-    fi
+    AC_MSG_RESULT($PY_VERSION)
     export PYTHON_INCLUDES PYTHON_LIB
     AC_SUBST(PYTHON_LIB)
     AC_SUBST(PYTHON_INCLUDES)
@@ -29,11 +37,13 @@ if test "x$PY_VERSION" "!=" "x"; then
 #include <Python.h>
 #include <Imaging.h>
 
-int main(int argn, char*argv[])
+int main()
 {
-    return Py_Main(argn, argv);
+    int ret;
+    ret = Py_Main(0, 0);
+    int x; // check also for gcc 2.95.x incompatibilities
+    return ret;
 }
-bli bla blo
 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