-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
#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
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