X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure;h=07d9aeb89c269b5aa4c2eb1d58909028003912a2;hb=bfe1524aca3a4f25d685e6552422d1e1986f570b;hp=9394f374adca280043dca6750995d1fa08084f44;hpb=b9ddd4a2ed601bc01ddacc69d2522687a93a94ce;p=swftools.git diff --git a/configure b/configure index 9394f37..07d9aeb 100755 --- a/configure +++ b/configure @@ -463,7 +463,7 @@ ac_includes_default="\ # include #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 EGREP ECHO AR ac_ct_AR STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL UNCOMPRESS 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 EGREP ECHO AR ac_ct_AR STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL UNCOMPRESS 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. @@ -1527,7 +1527,8 @@ if test "${enable_lame+set}" = set; then fi; PACKAGE=swftools -VERSION=2004-09-02-2157 +VERSION=2004-09-18-1422 + # ------------------------------------------------------------------ @@ -3924,7 +3925,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3927 "configure"' > conftest.$ac_ext + echo '#line 3928 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4816,7 +4817,7 @@ fi # Provide some information about the compiler. -echo "$as_me:4819:" \ +echo "$as_me:4820:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -5850,11 +5851,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:5853: $lt_compile\"" >&5) + (eval echo "\"\$as_me:5854: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:5857: \$? = $ac_status" >&5 + echo "$as_me:5858: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6083,11 +6084,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6086: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6087: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6090: \$? = $ac_status" >&5 + echo "$as_me:6091: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6143,11 +6144,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6146: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6147: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6150: \$? = $ac_status" >&5 + echo "$as_me:6151: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7522,7 +7523,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*) - echo '#line 7525 "configure"' > conftest.$ac_ext + echo '#line 7526 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8382,7 +8383,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:10663: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10666: \$? = $ac_status" >&5 + echo "$as_me:10667: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -10719,11 +10720,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10722: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10723: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10726: \$? = $ac_status" >&5 + echo "$as_me:10727: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11275,7 +11276,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*) - echo '#line 11278 "configure"' > conftest.$ac_ext + echo '#line 11279 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12135,7 +12136,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13064: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13067: \$? = $ac_status" >&5 + echo "$as_me:13068: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13120,11 +13121,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13123: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13124: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13127: \$? = $ac_status" >&5 + echo "$as_me:13128: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14479,7 +14480,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*) - echo '#line 14482 "configure"' > conftest.$ac_ext + echo '#line 14483 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15209,11 +15210,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15212: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15213: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15216: \$? = $ac_status" >&5 + echo "$as_me:15217: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15442,11 +15443,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15445: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15446: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15449: \$? = $ac_status" >&5 + echo "$as_me:15450: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15502,11 +15503,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15505: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15506: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15509: \$? = $ac_status" >&5 + echo "$as_me:15510: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16881,7 +16882,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*) - echo '#line 16884 "configure"' > conftest.$ac_ext + echo '#line 16885 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -17741,7 +17742,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&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 @@ -22156,6 +22158,25 @@ echo "${ECHO_T}no" >&6 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 + + # ------------------------------------------------------------------ @@ -22172,25 +22193,33 @@ fi echo "$as_me:$LINENO: checking for Python.h and PIL" >&5 echo $ECHO_N "checking for Python.h and PIL... $ECHO_C" >&6 -# should we support python versions below 2.2? -if test -f "/usr/lib/python2.2/site-packages/PIL/_imaging.so" -a -f "/usr/include/python2.2/Python.h";then - PY_VERSION=2.2 -fi -if test -f "/usr/lib/python2.3/site-packages/PIL/_imaging.so" -a -f "/usr/include/python2.3/Python.h";then - PY_VERSION=2.3 -fi -if test -f "/usr/lib/python2.4/site-packages/PIL/_imaging.so" -a -f "/usr/include/python2.4/Python.h";then - PY_VERSION=2.4 + +if test "x$PYTHON_LIB" '!=' "x" -a "x$PYTHON_INCLUDES" '!=' "x";then + PY_VERSION=unknown +else + # should we support python versions below 2.2? + if test -f "/usr/lib/python2.2/site-packages/PIL/_imaging.so" -a -f "/usr/include/python2.2/Python.h";then + PY_VERSION=2.2 + fi + if test -f "/usr/lib/python2.3/site-packages/PIL/_imaging.so" -a -f "/usr/include/python2.3/Python.h";then + PY_VERSION=2.3 + fi + if test -f "/usr/lib/python2.4/site-packages/PIL/_imaging.so" -a -f "/usr/include/python2.4/Python.h";then + PY_VERSION=2.4 + fi + # OS X: + # /System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3/Python.h + # /Library/Python/2.3/_imaging.so fi if test "x$PY_VERSION" "!=" "x"; then - echo "$as_me:$LINENO: result: python$PY_VERSION" >&5 -echo "${ECHO_T}python$PY_VERSION" >&6 + echo "$as_me:$LINENO: result: $PY_VERSION" >&5 +echo "${ECHO_T}$PY_VERSION" >&6 if test "x$PYTHON_LIB" = "x";then - PYTHON_LIB="-lpython$PY_VERSION /usr/lib/python$PY_VERSION/site-packages/PIL/_imaging.so" + PYTHON_LIB="-l$PY_VERSION /usr/lib/$PY_VERSION/site-packages/PIL/_imaging.so" fi if test "x$PYTHON_INCLUDES" = "x";then - PYTHON_INCLUDES="-I/usr/include/python$PY_VERSION" + PYTHON_INCLUDES="-I/usr/include/$PY_VERSION" fi export PYTHON_INCLUDES PYTHON_LIB @@ -22254,24 +22283,24 @@ if test "x$T1LIBMISSING" = "xtrue";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 @@ -22286,7 +22315,7 @@ if test "x${MISSINGLIBS}" '!=' "x"; then 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= @@ -22995,6 +23024,8 @@ s,@HAVE_UNISTD_H@,$HAVE_UNISTD_H,;t t 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