X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure.in;h=d1ce0c1ce4cf35360268f5b19f494f83aff7a028;hb=f7b80586819383664dd9c60bcc5f8d0eaefb751f;hp=0f945995ea499c2069338e568e9f7d42a7bdf7a9;hpb=376e92e42a88986d21f712696b5a2c065e1e3258;p=swftools.git

diff --git a/configure.in b/configure.in
index 0f94599..d1ce0c1 100644
--- 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=0.6.0
+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
@@ -167,8 +175,8 @@ dnl Checks for typedefs, structures, and compiler characteristics.
  AC_TYPE_OFF_T
  AC_TYPE_SIZE_T
  AC_STRUCT_TM
- AC_CHECK_TYPE(boolean,int)
- AC_CHECK_TYPE(bool,char)
+ AC_CHECK_TYPE(boolean,int) #needed for jpeglib
+ dnl AC_CHECK_TYPE(bool,char)
  dnl AC_CHECK_TYPE(uchar,unsigned char)
  dnl AC_CHECK_TYPE(schar,signed char)
  dnl AC_CHECK_TYPE(word,unsigned short int)
@@ -182,6 +190,8 @@ dnl Checks for library functions.
 
 RFX_CHECK_FREETYPE
 
+RFX_CHECK_FONTCONFIG
+
 # ------------------------------------------------------------------
  
 lame_objects= 
@@ -215,7 +225,23 @@ AC_SUBST(lame_objects)
 # ------------------------------------------------------------------
  
 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(avifil32, AVIFileInit,AVIFIL32=true)
+    #if test "x${AVIFIL32}" != "x"; then
+    #  VIDEO_LIBS="$VIDEO_LIBS -lavifil32"
+    #fi
+    VIDEO_LIBS="$VIDEO_LIBS -lavifil32"
+    AVIFIL32=true
+fi
+
+AC_SUBST(VIDEO_LIBS)
+AC_SUBST(VIDEO_CFLAGS)
 # ------------------------------------------------------------------
 
 if test "x${UNCOMPRESS}" = "xgzip"; then
@@ -231,44 +257,51 @@ if test "x$PYTHON_OK" '!=' "xyes";then
     echo all install uninstall clean: > lib/python/Makefile
     # fail silently- the most users won't have any need for the
     # python interface anyway
+else
+    pythonrfxswf="lib/python/Makefile"
 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"
+if test "x${ac_cv_header_jpeglib_h}" '!=' "xyes"; then
+    DISABLEPDF2SWF=true;
+    DISABLEJPEG2SWF=true;
+    MISSINGLIBS="${MISSINGLIBS} jpeglib.h"
+    PARTIAL=true
 fi
-if test "x$HAVE_FREETYPE" != "x1"; then
- DISABLEPDF2SWF=true;
- MISSINGLIBS="${MISSINGLIBS} freetype"
+if test "x$HAVE_FREETYPE" '!=' "x1"; then
+    DISABLEPDF2SWF=true;
+    MISSINGLIBS="${MISSINGLIBS} freetype"
+    PARTIAL=true
 fi
-if test "x${ac_cv_header_t1lib_h}" != "xyes"; then
- DISABLEPDF2SWF=true;
- MISSINGLIBS="${MISSINGLIBS} t1lib.h"
+if test "x${ac_cv_header_t1lib_h}" '!=' "xyes"; then
+    MISSINGLIBS="${MISSINGLIBS} t1lib.h"
 fi
-if test "x${ac_cv_header_zlib_h}" != "xyes"; then
- DISABLEPNG2SWF=true;
- MISSINGLIBS="${MISSINGLIBS} zlib.h"
+if test "x${ac_cv_header_zlib_h}" '!=' "xyes"; then
+    DISABLEPNG2SWF=true;
+    MISSINGLIBS="${MISSINGLIBS} zlib.h"
+    PARTIAL=true
 fi
-if test "x${AVIFILE}" != "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})
@@ -281,7 +314,7 @@ if test "x${MISSINGLIBS}" '!=' "x"; then
 fi
 
 avi2swf="avi2swf/Makefile"
-if test "x${AVIFILE}" != "xtrue"; then
+if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
  echo "* Disabling avi2swf tool..."
  echo all install uninstall clean: > avi2swf/Makefile
  avi2swf=
@@ -318,12 +351,16 @@ export PNG2SWF
 AC_SUBST(PNG2SWF)
 
 if test "x${MISSINGLIBS}" '!=' "x"; then
+  if test "x${PARTIAL}" '=' "x"; then
+    echo "* (never mind)"
+  fi
   echo "***************************************************"
 fi
 
 # ------------------------------------------------------------------
 
-FILES="./release Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile ${pythonrfxswf} ${lame_makefile}"
+if test -f "release.in"; then release_in="./release"; fi
+FILES="$release_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile ${pythonrfxswf} ${lame_makefile}"
 
 dnl AC_OUTPUT(${FILES}) old autoconf
 AC_CONFIG_FILES([${FILES}])