added HAVE_AVIFILE #define.

[swftools.git] / configure.in

diff --git a/configure.in b/configure.in
index 75d5e9f..4d1e504 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -16,9 +16,7 @@ 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-08-24-2049
-
-
+VERSION=2004-09-02-2157
 
 # ------------------------------------------------------------------
 
@@ -169,7 +167,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
  AC_TYPE_OFF_T
  AC_TYPE_SIZE_T
  AC_STRUCT_TM
- dnl AC_CHECK_TYPE(boolean,int)
+ 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)
@@ -184,6 +182,8 @@ dnl Checks for library functions.
 
 RFX_CHECK_FREETYPE
 
+RFX_CHECK_FONTCONFIG
+
 # ------------------------------------------------------------------
  
 lame_objects= 
@@ -217,7 +217,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(vfw32, AVIFileInit,VFW32=true)
+    #if test "x${VFW32}" != "x"; then
+    #  VIDEO_LIBS="$VIDEO_LIBS -lvfw32"
+    #fi
+    VIDEO_LIBS="$VIDEO_LIBS -lvfw32"
+    VFW32=true
+fi
+
+AC_SUBST(VIDEO_LIBS)
+AC_SUBST(VIDEO_CFLAGS)
 # ------------------------------------------------------------------
 
 if test "x${UNCOMPRESS}" = "xgzip"; then
@@ -233,6 +249,8 @@ 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
 
 # ------------------------------------------------------------------
@@ -252,24 +270,24 @@ if test "x$T1LIBMISSING" = "xtrue";then
     MISSINGLIBS="${MISSINGLIBS} t1lib"
 fi
 
-if test "x${ac_cv_header_jpeglib_h}" != "xyes"; then
+if test "x${ac_cv_header_jpeglib_h}" '!=' "xyes"; then
  DISABLEPDF2SWF=true;
  DISABLEJPEG2SWF=true;
  MISSINGLIBS="${MISSINGLIBS} jpeglib.h"
 fi
-if test "x$HAVE_FREETYPE" != "x1"; then
+if test "x$HAVE_FREETYPE" '!=' "x1"; then
  DISABLEPDF2SWF=true;
  MISSINGLIBS="${MISSINGLIBS} freetype"
 fi
-if test "x${ac_cv_header_t1lib_h}" != "xyes"; then
+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
+if test "x${ac_cv_header_zlib_h}" '!=' "xyes"; then
  DISABLEPNG2SWF=true;
  MISSINGLIBS="${MISSINGLIBS} zlib.h"
 fi
-if test "x${AVIFILE}" != "xtrue"; then
+if test "x${AVIFILE}" '!=' "xtrue" -a "x${VFW32}" '!=' "xtrue"; then
  MISSINGLIBS="${MISSINGLIBS} avifile"
 fi
 
@@ -283,7 +301,7 @@ if test "x${MISSINGLIBS}" '!=' "x"; then
 fi
 
 avi2swf="avi2swf/Makefile"
-if test "x${AVIFILE}" != "xtrue"; then
+if test "x${AVIFILE}" '!=' "xtrue" -a "x${VFW32}" '!=' "xtrue"; then
  echo "* Disabling avi2swf tool..."
  echo all install uninstall clean: > avi2swf/Makefile
  avi2swf=
@@ -325,7 +343,8 @@ 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}])