X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure;h=a52fc317de03e94cab1e765283fa83acbe02ee22;hb=ffa3139cabcd283e5bb1ec4df94ed52664c0eabe;hp=0cafc5c7188de3cb78738367b6e81b8959ee632e;hpb=a27d5697a6065395025d7f7a75ec39eb66c9b831;p=swftools.git

diff --git a/configure b/configure
index 0cafc5c..a52fc31 100755
--- a/configure
+++ b/configure
@@ -10090,6 +10090,8 @@ done
 # ------------------------------------------------------------------
 
 
+
+
 for ac_prog in freetype-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -10103,7 +10105,8 @@ else
   ac_cv_prog_FREETYPE_CONFIG="$FREETYPE_CONFIG" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+as_dummy=""$PATH:/usr/local/bin:/sw/bin:/opt/local/bin""
+for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -10130,6 +10133,9 @@ fi
   test -n "$FREETYPE_CONFIG" && break
 done
 
+
+
+
 OLDCPPFLAGS="${CPPFLAGS}"
 OLDLIBS="${LIBS}"
 if test "x${FREETYPE_CONFIG}" '!=' "x"; then
@@ -10520,7 +10526,7 @@ done
 fi
 
 if test "x${HAVE_LIB_FREETYPE}" '!=' "x" -o \
-        "x${HAVE_FREETYPE_CONFIG}" '!=' "x";then
+        "x${FREETYPE_CONFIG}" '!=' "x";then
     if test "x${HAVE_FREETYPE_FREETYPE_H}" '!=' "x";then
 	HAVE_FREETYPE=1
     fi
@@ -11548,14 +11554,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