X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure;h=8c34130919a7cce1dac9c37cf16a89dbdc302187;hp=026e1f167931382a3ca924164bbe48e8b50240da;hb=3520d107a8da451695f0c8d8684cd7706fa3b662;hpb=a925b03dc3e337ecfe124390ac3c43946e062e6c

diff --git a/configure b/configure
index 026e1f1..8c34130 100755
--- a/configure
+++ b/configure
@@ -1511,7 +1511,7 @@ if test "${enable_lame+set}" = set; then
 fi;
 
 PACKAGE=swftools
-VERSION=2004-09-18-1422
+VERSION=0.6.2
 
 
 # ------------------------------------------------------------------
@@ -11472,12 +11472,12 @@ _ACEOF
 fi
 
 if test "x${WIN32}" != "x"; then
-    #AC_CHECK_LIB(vfw32, AVIFileInit,VFW32=true)
-    #if test "x${VFW32}" != "x"; then
-    #  VIDEO_LIBS="$VIDEO_LIBS -lvfw32"
+    #AC_CHECK_LIB(avifil32, AVIFileInit,AVIFIL32=true)
+    #if test "x${AVIFIL32}" != "x"; then
+    #  VIDEO_LIBS="$VIDEO_LIBS -lavifil32"
     #fi
-    VIDEO_LIBS="$VIDEO_LIBS -lvfw32"
-    VFW32=true
+    VIDEO_LIBS="$VIDEO_LIBS -lavifil32"
+    AVIFIL32=true
 fi
 
 
@@ -11497,25 +11497,33 @@ fi
 
 echo "$as_me:$LINENO: checking for Python.h and PIL" >&5
 echo $ECHO_N "checking for Python.h and PIL... $ECHO_C" >&6
-# 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
-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
+
+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
+    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
 fi
 
 if test "x$PY_VERSION" "!=" "x"; then
-    echo "$as_me:$LINENO: result: python$PY_VERSION" >&5
-echo "${ECHO_T}python$PY_VERSION" >&6
+    echo "$as_me:$LINENO: result: $PY_VERSION" >&5
+echo "${ECHO_T}$PY_VERSION" >&6
     if test "x$PYTHON_LIB" = "x";then
-	PYTHON_LIB="-lpython$PY_VERSION /usr/lib/python$PY_VERSION/site-packages/PIL/_imaging.so"
+	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/python$PY_VERSION"
+	PYTHON_INCLUDES="-I/usr/include/$PY_VERSION"
     fi
     export PYTHON_INCLUDES PYTHON_LIB
 
@@ -11589,14 +11597,13 @@ if test "x$HAVE_FREETYPE" '!=' "x1"; then
  MISSINGLIBS="${MISSINGLIBS} freetype"
 fi
 if test "x${ac_cv_header_t1lib_h}" '!=' "xyes"; then
- DISABLEPDF2SWF=true;
  MISSINGLIBS="${MISSINGLIBS} t1lib.h"
 fi
 if test "x${ac_cv_header_zlib_h}" '!=' "xyes"; then
  DISABLEPNG2SWF=true;
  MISSINGLIBS="${MISSINGLIBS} zlib.h"
 fi
-if test "x${AVIFILE}" '!=' "xtrue" -a "x${VFW32}" '!=' "xtrue"; then
+if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
  MISSINGLIBS="${MISSINGLIBS} avifile"
 fi
 
@@ -11611,7 +11618,7 @@ if test "x${MISSINGLIBS}" '!=' "x"; then
 fi
 
 avi2swf="avi2swf/Makefile"
-if test "x${AVIFILE}" '!=' "xtrue" -a "x${VFW32}" '!=' "xtrue"; then
+if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
  echo "* Disabling avi2swf tool..."
  echo all install uninstall clean: > avi2swf/Makefile
  avi2swf=