X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=m4%2Favi2swf.m4;h=906fef12e7f10490c6a99da1edda515b0a7ef93e;hp=36f23cc73d2ac83e74db47e0ae56758dc622252e;hb=HEAD;hpb=f1fe720124d2fdc33defe18f6d1c3feda86980cf

diff --git a/m4/avi2swf.m4 b/m4/avi2swf.m4
index 36f23cc..906fef1 100644
--- a/m4/avi2swf.m4
+++ b/m4/avi2swf.m4
@@ -1,15 +1,14 @@
-AC_DEFUN(RFX_CHECK_AVI2SWF,
+AC_DEFUN([RFX_CHECK_AVI2SWF],
 [
 
-AC_CHECK_PROGS(AVIFILE_CONFIG, avifile-config)
+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
 
@@ -39,8 +38,8 @@ $HAVE_AVIFILE_VERSION_H_DEFINE
 #if (AVIFILE_MAJOR_VERSION == 0) && (AVIFILE_MINOR_VERSION>=6) 
    #include <avifile.h>
    #include <aviplay.h>
-   #include <fourcc.h>
-   #include <creators.h>
+   #include <avm_fourcc.h>
+   #include <avm_creators.h>
    #include <StreamInfo.h>
    #define VERSION6
 #else
@@ -103,12 +102,14 @@ int main (int argc, char*argv[])
 EOF
 
 if test "x$AVIFILE_CONFIG" '!=' "x";then
-    ac_link='$CXX $CPPFLAGS $CXXFLAGS `$AVIFILE_CONFIG --cflags` `$AVIFILE_CONFIG --libs` conftest.cpp -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
-      AC_DEFINE_UNQUOTED(AVIFILE, true)
+      AC_DEFINE([AVIFILE], [true], [Define if Avifile is available])
     else
       echo "configure: failed program was:" >&5
       cat conftest.cpp >&5