added MacOS X -shared/-bundle handling.

[swftools.git] / configure.in

diff --git a/configure.in b/configure.in
index 747e7ae..d1ce0c1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,8 @@ AC_ARG_ENABLE(lame,
 [  --disable-lame          don't compile any L.A.M.E. mp3 encoding code in], DISABLE_LAME=true)
 
 PACKAGE=swftools
-VERSION=2004-09-02-2157
+VERSION=2004-11-03-1856
+
 
 # ------------------------------------------------------------------
 
@@ -55,15 +56,22 @@ fi
 export PACKAGE VERSION CFLAGS CXXFLAGS
 
 dnl Checks for programs.
- AC_CANONICAL_HOST
+
+AC_CANONICAL_HOST
+
+SHARED="-shared"
 MACOSX=
 case $host_os in
     *darwin* ) 
        MACOSX=yes
        CFLAGS="$CFLAGS -fno-rtti"
        CXXFLAGS="$CXXFLAGS -fno-rtti"
+       SHARED="-bundle"
        ;;
 esac
+
+AC_SUBST(SHARED)
+
 dnl Checks for programs.
  AC_PROG_CC
  AC_PROG_CXX
@@ -220,15 +228,16 @@ RFX_CHECK_AVI2SWF
 if test "x${AVIFILE}" = "xtrue"; then
     VIDEO_LIBS="$VIDEO_LIBS $AVIFILE_LIBS"
     VIDEO_CFLAGS="$VIDEO_CFLAGS $AVIFILE_CFLAGS"
+    AC_DEFINE_UNQUOTED(HAVE_AVIFILE, 1)
 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
 
 AC_SUBST(VIDEO_LIBS)
@@ -255,39 +264,44 @@ fi
 # ------------------------------------------------------------------
 
 AC_MSG_CHECKING([for missing libraries])
- 
+
 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${VFW32}" '!=' "xtrue"; then
- MISSINGLIBS="${MISSINGLIBS} avifile"
+if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
+    MISSINGLIBS="${MISSINGLIBS} avifile"
+    PARTIAL=true
 fi
 
 AC_MSG_RESULT(${MISSINGLIBS})
@@ -300,7 +314,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=
@@ -337,6 +351,9 @@ export PNG2SWF
 AC_SUBST(PNG2SWF)
 
 if test "x${MISSINGLIBS}" '!=' "x"; then
+  if test "x${PARTIAL}" '=' "x"; then
+    echo "* (never mind)"
+  fi
   echo "***************************************************"
 fi