X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=m4%2Favi2swf.m4;h=06e94b08b4d9402b4bb19dfdae7911366b1a6694;hp=ef50edd4730e081480368a407133b289c8f95ab4;hb=26af26a251a58f33b295a0ae36ebd27ec167dc88;hpb=5a8db3625a47f0697ac1b1f459775ae59fe714ca

diff --git a/m4/avi2swf.m4 b/m4/avi2swf.m4
index ef50edd..06e94b0 100644
--- a/m4/avi2swf.m4
+++ b/m4/avi2swf.m4
@@ -2,7 +2,7 @@ AC_DEFUN(RFX_CHECK_AVI2SWF,
 [
 AC_MSG_CHECKING([whether we can compile the avifile test program])
 
-cat > conftest.$ac_ext << EOF
+cat > conftest.cpp << EOF
 #include <avifile/version.h>
 #if (AVIFILE_MAJOR_VERSION == 0) && (AVIFILE_MINOR_VERSION>=6) 
    #include <avifile.h>
@@ -21,7 +21,7 @@ cat > conftest.$ac_ext << EOF
    #define Bpp bpp
 #endif
 
-int main (int argc, char*argv[])
+int test()
 {
   IAviReadFile* player;
   IAviReadStream* astream;
@@ -64,10 +64,15 @@ int main (int argc, char*argv[])
   uint_t a,b;
   astream->ReadFrames(0,0,0,a,b);
 }
+int main (int argc, char*argv[])
+{
+    return 0;
+}
 EOF
 
-ac_link='$CXX $CPPFLAGS $CXXFLAGS `avifile-config --cflags` `avifile-config --libs` conftest.$ac_ext -o conftest${ac_exeext}'
-if {(eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ac_link='$CXX $CPPFLAGS $CXXFLAGS `avifile-config --cflags` `avifile-config --libs` conftest.cpp -o conftest${ac_exeext}'
+##if {(eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo avi2swf.m4:71: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && ./conftest${ac_exeext}; then
   AC_MSG_RESULT(yes)
   AVIFILE=true
   export AVIFILE