X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure.in;h=2e742202c0cb64a6199074c9907f9b850fff7a61;hb=035b6a652e57d4ec909d6e0642f91810795976bd;hp=747e7ae775105b10be8230ddfb6791db131fcdb2;hpb=7aa1118d74b472ac45e429d26f9805b6875b05bf;p=swftools.git diff --git a/configure.in b/configure.in index 747e7ae..2e74220 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=2004-09-02-2157 +VERSION=2004-09-18-1422 + # ------------------------------------------------------------------ @@ -220,15 +221,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) @@ -286,7 +288,7 @@ 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 @@ -300,7 +302,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=