From: kramm Date: Mon, 20 Sep 2004 16:17:38 +0000 (+0000) Subject: added checking for vfw, cleaned up avifile checks. X-Git-Tag: release-0-6-2~46 X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=2a8b5968887393e4a76717324eb5a1e13f1b9257;p=swftools.git added checking for vfw, cleaned up avifile checks. --- diff --git a/m4/avi2swf.m4 b/m4/avi2swf.m4 index a74cf35..211846b 100644 --- a/m4/avi2swf.m4 +++ b/m4/avi2swf.m4 @@ -5,11 +5,10 @@ AC_CHECK_PROGS(AVIFILE_CONFIG, avifile-config) if test "x$AVIFILE_CONFIG" '!=' "x";then OLDCPPFLAGS="$CPPFLAGS" - #OLDLDFLAGS="$LDFLAGS" + # temporarily add avifile paths to CPPFLAGS... CPPFLAGS="$CPPFLAGS $CXXFLAGS "`$AVIFILE_CONFIG --cflags` - #LDFLAGS="$LDFLAGS `$AVIFILE_CONFIG --libs`" AC_CHECK_HEADERS(avifile/version.h version.h) - #LDFLAGS="$OLDLDFLAGS" + # ... and reset CPPFLAGS="$OLDCPPFLAGS" fi @@ -103,8 +102,10 @@ int main (int argc, char*argv[]) EOF if test "x$AVIFILE_CONFIG" '!=' "x";then - ac_link='$CXX $CPPFLAGS $CXXFLAGS `$AVIFILE_CONFIG --cflags` conftest.cpp `$AVIFILE_CONFIG --libs` -o conftest${ac_exeext}' - if { (eval echo avi2swf.m4:71: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && ./conftest${ac_exeext}; then + AVIFILE_LIBS=`$AVIFILE_CONFIG --libs` + AVIFILE_CFLAGS=`$AVIFILE_CONFIG --cflags` + avifile_link='$CXX $CPPFLAGS $CXXFLAGS $AVIFILE_CFLAGS conftest.cpp $AVIFILE_LIBS -o conftest${ac_exeext}' + if { (eval echo avi2swf.m4:71: \"$avifile_link\") 1>&5; (eval $avifile_link) 2>&5; } && test -s conftest${ac_exeext} && ./conftest${ac_exeext}; then AC_MSG_RESULT(yes) AVIFILE=true export AVIFILE