git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
g++ -> $CXX $CPPFLAGS $CXXFLAGS
[swftools.git]
/
m4
/
swf.m4
diff --git
a/m4/swf.m4
b/m4/swf.m4
index
d304e4e
..
f00fa78
100644
(file)
--- a/
m4/swf.m4
+++ b/
m4/swf.m4
@@
-79,7
+79,7
@@
AC_MSG_CHECKING([whether we can compile the avifile test program])
cat > conftest.$ac_ext << EOF
#include <avifile/version.h>
cat > conftest.$ac_ext << EOF
#include <avifile/version.h>
-#if (AVIFILE_MAJOR_VERSION == 0) && (AVIFILE_MINOR_VERSION==6)
+#if (AVIFILE_MAJOR_VERSION == 0) && (AVIFILE_MINOR_VERSION>=6)
#include <avifile.h>
#include <aviplay.h>
#include <fourcc.h>
#include <avifile.h>
#include <aviplay.h>
#include <fourcc.h>
@@
-141,7
+141,7
@@
int main (int argc, char*argv[])
}
EOF
}
EOF
-ac_link='g++ `avifile-config --cflags` `avifile-config --libs` conftest.$ac_ext -o conftest${ac_exeext}'
+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_MSG_RESULT(yes)
AVIFILE=true
if {(eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
AC_MSG_RESULT(yes)
AVIFILE=true