# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECHO STRIP ac_ct_STRIP EGREP LIBTOOL UNCOMPRESS AR SLEXT target target_cpu target_vendor target_os WORDS_BIGENDIAN SYSTEM_BACKTICKS PACKAGE VERSION HAVE_UNISTD_H FREETYPE_CONFIG lame_objects AVIFILE_CONFIG USE_GZIP PYTHON_LIB PYTHON_INCLUDES JPEG2SWF PNG2SWF LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECHO STRIP ac_ct_STRIP EGREP LIBTOOL UNCOMPRESS AR SLEXT target target_cpu target_vendor target_os WORDS_BIGENDIAN SYSTEM_BACKTICKS PACKAGE VERSION HAVE_UNISTD_H FREETYPE_CONFIG lame_objects AVIFILE_CONFIG VIDEO_LIBS VIDEO_CFLAGS USE_GZIP PYTHON_LIB PYTHON_INCLUDES JPEG2SWF PNG2SWF LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
fi;
PACKAGE=swftools
-VERSION=2004-09-02-2157
+VERSION=2004-09-18-1422
+
# ------------------------------------------------------------------
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4796 "configure"' > conftest.$ac_ext
+ echo '#line 4797 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:5372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s out/conftest.err; then
libsuff=
case "$host_cpu" in
x86_64*)
- echo '#line 6605 "configure"' > conftest.$ac_ext
+ echo '#line 6606 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7353 "configure"
+#line 7354 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7451 "configure"
+#line 7452 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
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`"
for ac_header in avifile/version.h version.h
done
- #LDFLAGS="$OLDLDFLAGS"
+ # ... and reset
CPPFLAGS="$OLDCPPFLAGS"
fi
EOF
if test "x$AVIFILE_CONFIG" '!=' "x";then
- ac_link='$CXX $CPPFLAGS $CXXFLAGS `$AVIFILE_CONFIG --cflags` conftest.cpp `$AVIFILE_CONFIG --libs` -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
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
AVIFILE=true
fi
rm -f conftest*
+if test "x${AVIFILE}" = "xtrue"; then
+ VIDEO_LIBS="$VIDEO_LIBS $AVIFILE_LIBS"
+ VIDEO_CFLAGS="$VIDEO_CFLAGS $AVIFILE_CFLAGS"
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_AVIFILE 1
+_ACEOF
+
+fi
+
+if test "x${WIN32}" != "x"; then
+ #AC_CHECK_LIB(avifil32, AVIFileInit,AVIFIL32=true)
+ #if test "x${AVIFIL32}" != "x"; then
+ # VIDEO_LIBS="$VIDEO_LIBS -lavifil32"
+ #fi
+ VIDEO_LIBS="$VIDEO_LIBS -lavifil32"
+ AVIFIL32=true
+fi
+
+
# ------------------------------------------------------------------
int main(int argn, char*argv)
{
- return Py_Main(argn, argv);
+ int ret;
+ ret = Py_Main(argn, argv);
+ int x; // check also for gcc 2.95.x incompatibilities
+ return ret;
}
-bli bla blo
EOF
ac_link='$CC $CPPFLAGS $CFLAGS $PYTHON_INCLUDES conftest.c $LDFLAGS $PYTHON_LIB $LIBS -o conftest${ac_exeext}'
if { (eval echo python.m4: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
MISSINGLIBS="${MISSINGLIBS} t1lib"
fi
-if test "x${ac_cv_header_jpeglib_h}" != "xyes"; then
+if test "x${ac_cv_header_jpeglib_h}" '!=' "xyes"; then
DISABLEPDF2SWF=true;
DISABLEJPEG2SWF=true;
MISSINGLIBS="${MISSINGLIBS} jpeglib.h"
fi
-if test "x$HAVE_FREETYPE" != "x1"; then
+if test "x$HAVE_FREETYPE" '!=' "x1"; then
DISABLEPDF2SWF=true;
MISSINGLIBS="${MISSINGLIBS} freetype"
fi
-if test "x${ac_cv_header_t1lib_h}" != "xyes"; then
+if test "x${ac_cv_header_t1lib_h}" '!=' "xyes"; then
DISABLEPDF2SWF=true;
MISSINGLIBS="${MISSINGLIBS} t1lib.h"
fi
-if test "x${ac_cv_header_zlib_h}" != "xyes"; then
+if test "x${ac_cv_header_zlib_h}" '!=' "xyes"; then
DISABLEPNG2SWF=true;
MISSINGLIBS="${MISSINGLIBS} zlib.h"
fi
-if test "x${AVIFILE}" != "xtrue"; then
+if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
MISSINGLIBS="${MISSINGLIBS} avifile"
fi
fi
avi2swf="avi2swf/Makefile"
-if test "x${AVIFILE}" != "xtrue"; then
+if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
echo "* Disabling avi2swf tool..."
echo all install uninstall clean: > avi2swf/Makefile
avi2swf=
# ------------------------------------------------------------------
-FILES="./release Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile ${pythonrfxswf} ${lame_makefile}"
+if test -f "release.in"; then release_in="./release"; fi
+FILES="$release_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile ${pythonrfxswf} ${lame_makefile}"
ac_config_files="$ac_config_files ${FILES}"
s,@FREETYPE_CONFIG@,$FREETYPE_CONFIG,;t t
s,@lame_objects@,$lame_objects,;t t
s,@AVIFILE_CONFIG@,$AVIFILE_CONFIG,;t t
+s,@VIDEO_LIBS@,$VIDEO_LIBS,;t t
+s,@VIDEO_CFLAGS@,$VIDEO_CFLAGS,;t t
s,@USE_GZIP@,$USE_GZIP,;t t
s,@PYTHON_LIB@,$PYTHON_LIB,;t t
s,@PYTHON_INCLUDES@,$PYTHON_INCLUDES,;t t