fixed python MacOS X detection.

[swftools.git] / configure

diff --git a/configure b/configure
index 07d9aeb..4807304 100755 (executable)
--- a/configure
+++ b/configure
@@ -1527,7 +1527,7 @@ if test "${enable_lame+set}" = set; then
 fi;
 
 PACKAGE=swftools
-VERSION=2004-09-18-1422
+VERSION=2004-10-24-1908
 
 
 # ------------------------------------------------------------------
@@ -22197,30 +22197,30 @@ echo $ECHO_N "checking for Python.h and PIL... $ECHO_C" >&6
 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/PIL/_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.$v/PIL/_imaging.so"
+            PYTHON_INCLUDES="-I/System/Library/Frameworks/Python.framework/Versions/2.$v/include/python2.$v/"
+        fi
+    done
 fi
 
 if test "x$PY_VERSION" "!=" "x"; then
     echo "$as_me:$LINENO: result: $PY_VERSION" >&5
 echo "${ECHO_T}$PY_VERSION" >&6
-    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
 
 
@@ -22231,10 +22231,10 @@ echo $ECHO_N "checking whether we can compile the python test program... $ECHO_C
 #include <Python.h>
 #include <Imaging.h>
 
-int main(int argn, char*argv)
+int main()
 {
     int ret;
-    ret = Py_Main(argn, argv);
+    ret = Py_Main(0, 0);
     int x; // check also for gcc 2.95.x incompatibilities
     return ret;
 }
@@ -22272,36 +22272,41 @@ echo $ECHO_N "checking for missing libraries... $ECHO_C" >&6
 
 if test "x$ZLIBMISSING" = "xtrue";then
     MISSINGLIBS="${MISSINGLIBS} zlib"
-    DISABLEPNG2SWF=true;
+    DISABLEPNG2SWF=true
+    PARTIAL=true
 fi
 if test "x$JPEGLIBMISSING" = "xtrue";then
     MISSINGLIBS="${MISSINGLIBS} jpeglib"
-    DISABLEPDF2SWF=true;
-    DISABLEJPEG2SWF=true;
+    DISABLEPDF2SWF=true
+    DISABLEJPEG2SWF=true
+    PARTIAL=true
 fi
 if test "x$T1LIBMISSING" = "xtrue";then
     MISSINGLIBS="${MISSINGLIBS} t1lib"
 fi
 
 if test "x${ac_cv_header_jpeglib_h}" '!=' "xyes"; then
- DISABLEPDF2SWF=true;
- DISABLEJPEG2SWF=true;
- MISSINGLIBS="${MISSINGLIBS} jpeglib.h"
+    DISABLEPDF2SWF=true;
+    DISABLEJPEG2SWF=true;
+    MISSINGLIBS="${MISSINGLIBS} jpeglib.h"
+    PARTIAL=true
 fi
 if test "x$HAVE_FREETYPE" '!=' "x1"; then
- DISABLEPDF2SWF=true;
- MISSINGLIBS="${MISSINGLIBS} freetype"
+    DISABLEPDF2SWF=true;
+    MISSINGLIBS="${MISSINGLIBS} freetype"
+    PARTIAL=true
 fi
 if test "x${ac_cv_header_t1lib_h}" '!=' "xyes"; then
- DISABLEPDF2SWF=true;
- MISSINGLIBS="${MISSINGLIBS} t1lib.h"
+    MISSINGLIBS="${MISSINGLIBS} t1lib.h"
 fi
 if test "x${ac_cv_header_zlib_h}" '!=' "xyes"; then
- DISABLEPNG2SWF=true;
- MISSINGLIBS="${MISSINGLIBS} zlib.h"
+    DISABLEPNG2SWF=true;
+    MISSINGLIBS="${MISSINGLIBS} zlib.h"
+    PARTIAL=true
 fi
 if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
- MISSINGLIBS="${MISSINGLIBS} avifile"
+    MISSINGLIBS="${MISSINGLIBS} avifile"
+    PARTIAL=true
 fi
 
 echo "$as_me:$LINENO: result: ${MISSINGLIBS}" >&5
@@ -22352,6 +22357,9 @@ export PNG2SWF
 
 
 if test "x${MISSINGLIBS}" '!=' "x"; then
+  if test "x${PARTIAL}" '=' "x"; then
+    echo "* (never mind)"
+  fi
   echo "***************************************************"
 fi