several bugfixes, added MacOS X detection.

diff --git a/m4/python.m4 b/m4/python.m4
index 7131543..ccbc95b 100644 (file)
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -5,29 +5,29 @@ AC_MSG_CHECKING([for Python.h and PIL])
 if test "x$PYTHON_LIB" '!=' "x" -a "x$PYTHON_INCLUDES" '!=' "x";then
     PY_VERSION=unknown
 else
-    # 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
+    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 -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
-    fi
-    # OS X:
-    # /System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3/Python.h
-    # /Library/Python/2.3/_imaging.so
+    # 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/_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.3/_imaging.so"
+            PYTHON_INCLUDES="-I/System/Library/Frameworks/Python.framework/Versions/2.3/include/python$PY_VERSION/"
+        fi
+    done
 fi
 
 if test "x$PY_VERSION" "!=" "x"; then
     AC_MSG_RESULT($PY_VERSION)
-    if test "x$PYTHON_LIB" = "x";then
-       PYTHON_LIB="-l$PY_VERSION /usr/lib/$PY_VERSION/site-packages/PIL/_imaging.so"
-    fi
-    if test "x$PYTHON_INCLUDES" = "x";then
-       PYTHON_INCLUDES="-I/usr/include/$PY_VERSION"
-    fi
     export PYTHON_INCLUDES PYTHON_LIB
     AC_SUBST(PYTHON_LIB)
     AC_SUBST(PYTHON_INCLUDES)