X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=m4%2Fpython.m4;h=9a1e026ea58a279a274596ad42a9d042391695fd;hb=577e282e21131c72d58c7fad098a50beacdf5daa;hp=7d2f4dea0fbf601282f1da7cc0c0a3a6f288f8a2;hpb=9527ce12c567acbfd5474bce0dedecb1969aff49;p=swftools.git diff --git a/m4/python.m4 b/m4/python.m4 index 7d2f4de..9a1e026 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -15,14 +15,22 @@ else 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 + elif test -f "/Library/Python/2.$v/PIL/_imaging.so" \ + -a -f "/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_LIB="-framework Python /Library/Python/2.$v/PIL/_imaging.so" 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" \ + -a -f "/sw/lib/python2.$v/site-packages/PIL/_imaging.so";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" + PYTHON_INCLUDES="-I /sw/include/python2.$v/" fi done fi