X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=m4%2Fpython.m4;h=ce0bff2b54eff02999baad38f47d10811ef3e8b8;hb=c63b2bf21dc1df9a736f0b4c08f6cba828cdab92;hp=c6977287ffce7999e683d549ee815cd20daefce5;hpb=dd1bf09dad3b85a6e97063d9e54370643d4bd11a;p=swftools.git

diff --git a/m4/python.m4 b/m4/python.m4
index c697728..ce0bff2 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -1,4 +1,4 @@
-AC_DEFUN(RFX_CHECK_PYTHON,
+AC_DEFUN([RFX_CHECK_PYTHON],
 [
 AC_MSG_CHECKING([for Python.h])
 
@@ -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
-    # 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
@@ -22,17 +22,16 @@ else
             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" \
@@ -53,7 +52,7 @@ else
 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)
@@ -97,7 +96,7 @@ EOF
             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)
@@ -114,6 +113,6 @@ EOF
     fi
     rm -f conftest*
 else
-    AC_MSG_RESULT(nope)
+    AC_MSG_RESULT([nope])
 fi
 ])