git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved extern declaration up to prevent compile-time errors.
[swftools.git]
/
m4
/
avi2swf.m4
diff --git
a/m4/avi2swf.m4
b/m4/avi2swf.m4
index
fc15b67
..
06e94b0
100644
(file)
--- 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])
[
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>
#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
#define Bpp bpp
#endif
-int main (int argc, char*argv[])
+int test()
{
IAviReadFile* player;
IAviReadStream* astream;
{
IAviReadFile* player;
IAviReadStream* astream;
@@
-64,11
+64,15
@@
int main (int argc, char*argv[])
uint_t a,b;
astream->ReadFrames(0,0,0,a,b);
}
uint_t a,b;
astream->ReadFrames(0,0,0,a,b);
}
+int main (int argc, char*argv[])
+{
+ return 0;
+}
EOF
EOF
-ac_link='$CXX $CPPFLAGS $CXXFLAGS `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.cpp -o conftest${ac_exeext}'
##if {(eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
##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}; 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
AC_MSG_RESULT(yes)
AVIFILE=true
export AVIFILE