X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=m4%2Favi2swf.m4;h=906fef12e7f10490c6a99da1edda515b0a7ef93e;hb=c1e49c576e3589d84427f1d305cf226d720c2288;hp=9339f7d5240699af8c99a241c223a5fe433afe30;hpb=25bcd58015dcd377d7470cca8db3fce47ee9c220;p=swftools.git

diff --git a/m4/avi2swf.m4 b/m4/avi2swf.m4
index 9339f7d..906fef1 100644
--- a/m4/avi2swf.m4
+++ b/m4/avi2swf.m4
@@ -1,15 +1,45 @@
-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"
+    # temporarily add avifile paths to CPPFLAGS...
+    CPPFLAGS="$CPPFLAGS $CXXFLAGS "`$AVIFILE_CONFIG --cflags`
+    AC_CHECK_HEADERS(avifile/version.h version.h)
+    # ... and reset
+    CPPFLAGS="$OLDCPPFLAGS"
+fi
+
 AC_MSG_CHECKING([whether we can compile the avifile test program])
 
+if test "x${ac_cv_header_version_h}" '=' "xyes";then
+    HAVE_VERSION_H_DEFINE='#define HAVE_VERSION_H'
+fi
+if test "x${ac_cv_header_avifile_version_h}" '=' "xyes";then
+    HAVE_AVIFILE_VERSION_H_DEFINE='#define HAVE_AVIFILE_VERSION_H'
+fi
+
 cat > conftest.cpp << EOF
-#include <avifile/version.h>
+
+// hack- we can't yet access the variables in config.h (because it hasn't been generated yet),
+// so we have to introduce them this way
+$HAVE_VERSION_H_DEFINE
+$HAVE_AVIFILE_VERSION_H_DEFINE
+
+#ifdef HAVE_VERSION_H
+  #include <version.h>
+#endif
+#ifdef HAVE_AVIFILE_VERSION_H
+  #include <avifile/version.h>
+#endif
+
 #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
@@ -22,7 +52,7 @@ cat > conftest.cpp << EOF
    #define Bpp bpp
 #endif
 
-int test()
+void test()
 {
   IAviReadFile* player;
   IAviReadStream* astream;
@@ -72,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