From: kramm <kramm>
Date: Tue, 23 Nov 2004 17:10:00 +0000 (+0000)
Subject: Mac OS X fixes.
X-Git-Tag: release-0-6-3~142
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=61b8c53b9732b711b1ea93281d9fc7a972032fa9

Mac OS X fixes.
---

diff --git a/m4/freetype.m4 b/m4/freetype.m4
index 3ffbea0..709de3f 100644
--- a/m4/freetype.m4
+++ b/m4/freetype.m4
@@ -30,11 +30,20 @@ fi
 fi
 fi
 
-AC_CHECK_LIB(freetype, FT_Init_FreeType,HAVE_LIB_FREETYPE=1,)
-AC_CHECK_HEADERS(freetype/freetype.h,HAVE_FREETYPE_FREETYPE_H=1)
+if test "x${FREETYPE_CONFIG}" '=' "x";then
+    # if we didn't find the freetype-config program, we won't
+    # know where the libs are expected to be. So just blindly
+    # try to link against them.
+    AC_CHECK_LIB(freetype, FT_Init_FreeType,HAVE_LIB_FREETYPE=1,)
+fi
+
 AC_CHECK_HEADERS(ft2build.h,HAVE_FT2BUILD_H=1)
+if test "x${HAVE_FT2BUILD_H}" '=' "x";then
+    AC_CHECK_HEADERS(freetype/freetype.h,HAVE_FREETYPE_FREETYPE_H=1)
+fi
 
-if test "x${HAVE_LIB_FREETYPE}" '!=' "x";then
+if test "x${HAVE_LIB_FREETYPE}" '!=' "x" -o \
+        "x${FREETYPE_CONFIG}" '!=' "x";then
     if test "x${HAVE_FREETYPE_FREETYPE_H}" '!=' "x";then
 	HAVE_FREETYPE=1
     fi
@@ -44,15 +53,15 @@ if test "x${HAVE_LIB_FREETYPE}" '!=' "x";then
 fi
 
 if test "x${HAVE_FREETYPE}" = "x1"; then 
-    if test "x{$FREETYPE_CONFIG}" '!=' "x"; then
+    if test "x${FREETYPE_CONFIG}" '!=' "x"; then
 	LIBS="$LIBS "`freetype-config --libs`
     else
 	LIBS="$LIBS -lfreetype"
     fi
 
-if test "x${HAVE_FT2BUILD_H}" = "x1"; then
-    HAVE_FT2BUILD_H_DEFINE='#define HAVE_FT2BUILD_H'
-fi
+    if test "x${HAVE_FT2BUILD_H}" = "x1"; then
+	HAVE_FT2BUILD_H_DEFINE='#define HAVE_FT2BUILD_H'
+    fi
 
     AC_MSG_CHECKING([whether we can compile the freetype test program])
 
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