X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure;h=89fa6e2176a05f3a9e52c6077a7a17c8615464cc;hb=89bf852c497d296477ac788f00a06b11e5502fa9;hp=84c9aa32240d0b801f881a792f3c14aabde9f21b;hpb=39e3c25f1c8500f6a50b2a9284eaf553da392c27;p=swftools.git diff --git a/configure b/configure index 84c9aa3..89fa6e2 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.58. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -468,7 +468,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 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 SHARED 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. @@ -1019,6 +1019,7 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-checkmem turn on ccmalloc debugging --enable-debug turn on debugging + --enable-profiling turn on profiling --enable-warnings turn on compiler warnings --enable-optimizations turn on compiler optimizations (recommended for avi2swf) --disable-lame don't compile any L.A.M.E. mp3 encoding code in @@ -1080,43 +1081,40 @@ case $srcdir in ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; +case "$ac_dir" in +.) ac_abs_builddir=$ac_builddir;; *) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; + case $ac_builddir in + .) ac_abs_builddir="$ac_dir";; + [\\/]* | ?:[\\/]* ) ac_abs_builddir=$ac_builddir;; + *) ac_abs_builddir="$ac_dir"/$ac_builddir;; esac;; esac -case $ac_abs_builddir in +case "$ac_dir" in .) ac_abs_top_builddir=${ac_top_builddir}.;; *) case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; + .) ac_abs_top_builddir="$ac_dir";; [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + *) ac_abs_top_builddir="$ac_dir"/${ac_top_builddir}.;; esac;; esac -case $ac_abs_builddir in +case "$ac_dir" in .) ac_abs_srcdir=$ac_srcdir;; *) case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; + .) ac_abs_srcdir="$ac_dir";; [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + *) ac_abs_srcdir="$ac_dir"/$ac_srcdir;; esac;; esac -case $ac_abs_builddir in +case "$ac_dir" in .) ac_abs_top_srcdir=$ac_top_srcdir;; *) case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; + .) ac_abs_top_srcdir="$ac_dir";; [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + *) ac_abs_top_srcdir="$ac_dir"/$ac_top_srcdir;; esac;; esac @@ -1155,7 +1153,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.58. Invocation command line was $ $0 $@ @@ -1494,6 +1492,11 @@ if test "${enable_debug+set}" = set; then enableval="$enable_debug" DEBUG=true fi; +# Check whether --enable-profiling or --disable-profiling was given. +if test "${enable_profiling+set}" = set; then + enableval="$enable_profiling" + PROFILING=true +fi; # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" @@ -1511,7 +1514,8 @@ if test "${enable_lame+set}" = set; then fi; PACKAGE=swftools -VERSION=2004-09-02-2157 +VERSION=2004-11-23-2234 + # ------------------------------------------------------------------ @@ -1528,9 +1532,18 @@ fi if test "x$CHECKMEM" '!=' "x";then DEBUG=yes fi +if test "x$PROFILING" '!=' "x";then + DEBUG=yes +fi if test "x$DEBUG" '!=' "x";then - CFLAGS="$WARNINGS -g $CFLAGS" - CXXFLAGS="$WARNINGS -g $CXXFLAGS" + if test "x$PROFILING" = "x";then + CFLAGS="$WARNINGS -g $CFLAGS" + CXXFLAGS="$WARNINGS -g $CXXFLAGS" + else + CFLAGS="$WARNINGS -O2 -g -pg $CFLAGS" + CXXFLAGS="$WARNINGS -O2 -g -pg $CXXFLAGS" + LDFLAGS="-g -pg $LIBS" + fi else if test "x$OPTIMIZE" '!=' "x"; then CFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CFLAGS" CXXFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CXXFLAGS" @@ -1549,7 +1562,8 @@ fi export PACKAGE VERSION CFLAGS CXXFLAGS - ac_aux_dir= + +ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then ac_aux_dir=$ac_dir @@ -1628,14 +1642,20 @@ host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +SHARED="-shared" MACOSX= case $host_os in *darwin* ) MACOSX=yes CFLAGS="$CFLAGS -fno-rtti" CXXFLAGS="$CXXFLAGS -fno-rtti" + SHARED="-bundle" ;; esac + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4793,7 +4813,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4796 "configure"' > conftest.$ac_ext + echo '#line 4816 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5369,7 +5389,7 @@ chmod -w . 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:5392: \"$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 @@ -6602,7 +6622,7 @@ linux-gnu*) libsuff= case "$host_cpu" in x86_64*) - echo '#line 6605 "configure"' > conftest.$ac_ext + echo '#line 6625 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7350,7 +7370,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 break 2 fi done done + ;; +esac fi -fi -FREETYPE_CONFIG=$ac_cv_prog_FREETYPE_CONFIG +FREETYPE_CONFIG=$ac_cv_path_FREETYPE_CONFIG + if test -n "$FREETYPE_CONFIG"; then echo "$as_me:$LINENO: result: $FREETYPE_CONFIG" >&5 echo "${ECHO_T}$FREETYPE_CONFIG" >&6 @@ -10098,13 +10131,11 @@ else echo "${ECHO_T}no" >&6 fi - test -n "$FREETYPE_CONFIG" && break -done OLDCPPFLAGS="${CPPFLAGS}" OLDLIBS="${LIBS}" if test "x${FREETYPE_CONFIG}" '!=' "x"; then - CPPFLAGS="$CPPFLAGS "`freetype-config --cflags` + CPPFLAGS="$CPPFLAGS "`$FREETYPE_CONFIG --cflags` else if test -d /usr/include/freetype2; then CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2" else if test -d /usr/local/include/freetype2; then @@ -10113,7 +10144,11 @@ fi fi fi -echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5 +if test "x${FREETYPE_CONFIG}" '=' "x";then + # if we didn't find the freetype-config program, we won't + # know where the libs are expected to be. So just blindly + # try to link against them. + echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5 echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C" >&6 if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10181,8 +10216,10 @@ if test $ac_cv_lib_freetype_FT_Init_FreeType = yes; then HAVE_LIB_FREETYPE=1 fi +fi -for ac_header in freetype/freetype.h + +for ac_header in ft2build.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -10326,13 +10363,14 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - HAVE_FREETYPE_FREETYPE_H=1 + HAVE_FT2BUILD_H=1 fi done +if test "x${HAVE_FT2BUILD_H}" '=' "x";then -for ac_header in ft2build.h +for ac_header in freetype/freetype.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -10476,13 +10514,15 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - HAVE_FT2BUILD_H=1 + HAVE_FREETYPE_FREETYPE_H=1 fi done +fi -if test "x${HAVE_LIB_FREETYPE}" '!=' "x";then +if test "x${HAVE_LIB_FREETYPE}" '!=' "x" -o \ + "x${FREETYPE_CONFIG}" '!=' "x";then if test "x${HAVE_FREETYPE_FREETYPE_H}" '!=' "x";then HAVE_FREETYPE=1 fi @@ -10492,15 +10532,15 @@ if test "x${HAVE_LIB_FREETYPE}" '!=' "x";then fi if test "x${HAVE_FREETYPE}" = "x1"; then - if test "x{$FREETYPE_CONFIG}" '!=' "x"; then - LIBS="$LIBS "`freetype-config --libs` + if test "x${FREETYPE_CONFIG}" '!=' "x"; then + LIBS="$LIBS "`$FREETYPE_CONFIG --libs` else LIBS="$LIBS -lfreetype" fi -if test "x${HAVE_FT2BUILD_H}" = "x1"; then - HAVE_FT2BUILD_H_DEFINE='#define HAVE_FT2BUILD_H' -fi + if test "x${HAVE_FT2BUILD_H}" = "x1"; then + HAVE_FT2BUILD_H_DEFINE='#define HAVE_FT2BUILD_H' + fi echo "$as_me:$LINENO: checking whether we can compile the freetype test program" >&5 echo $ECHO_N "checking whether we can compile the freetype test program... $ECHO_C" >&6 @@ -10891,7 +10931,7 @@ if test "x${DISABLE_LAME}" = "xtrue"; then else # old lame code at lib/lame if test -f lib/lame/Makefile.in; then - lame_objects="lame/psymodel.o lame/fft.o lame/newmdct.o lame/quantize.o lame/takehiro.o lame/reservoir.o lame/quantize_pvt.o lame/vbrquantize.o lame/encoder.o lame/id3tag.o lame/version.o lame/tables.o lame/util.o lame/bitstream.o lame/set_get.o lame/VbrTag.o lame/lame.o" + lame_objects="lame/psymodel.\$(O) lame/fft.\$(O) lame/newmdct.\$(O) lame/quantize.\$(O) lame/takehiro.\$(O) lame/reservoir.\$(O) lame/quantize_pvt.\$(O) lame/vbrquantize.\$(O) lame/encoder.\$(O) lame/id3tag.\$(O) lame/version.\$(O) lame/tables.\$(O) lame/util.\$(O) lame/bitstream.\$(O) lame/set_get.\$(O) lame/VbrTag.\$(O) lame/lame.\$(O)" lame_makefile="lib/lame/Makefile" CPPFLAGS="$CPPFLAGS -Ilame" cat >>confdefs.h <<_ACEOF @@ -11189,9 +11229,8 @@ done 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 @@ -11343,7 +11382,7 @@ fi done - #LDFLAGS="$OLDLDFLAGS" + # ... and reset CPPFLAGS="$OLDCPPFLAGS" fi @@ -11438,8 +11477,10 @@ int main (int argc, char*argv) 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 @@ -11460,6 +11501,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 + + # ------------------------------------------------------------------ @@ -11476,26 +11536,43 @@ 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 + if test "x$PYTHON_LIB" '!=' "x" -o "x$PYTHON_INCLUDES" '!=' "x";then + echo "Set both PYTHON_LIB and PYTHON_INCLUDES, or none at all" + fi + # iterate through version 2.2 to 2.4 + for v in 2 3 4; do + # Linux + if test -f "/usr/lib/python2.$v/site-packages/PIL/_imaging.so" -a -f "/usr/include/python2.$v/Python.h";then + PY_VERSION=2.$v + PYTHON_LIB="-lpython$PY_VERSION /usr/lib/python$PY_VERSION/site-packages/PIL/_imaging.so" + PYTHON_INCLUDES="-I/usr/include/python$PY_VERSION" + # Mac OS X + elif test -f "/Library/Python/2.$v/PIL/_imaging.so" \ + -a -f "/System/Library/Frameworks/Python.framework/Versions/2.$v/include/python2.$v/Python.h";then + PY_VERSION=2.$v + PYTHON_LIB="-framework Python /Library/Python/2.$v/PIL/_imaging.so" + PYTHON_INCLUDES="-I/System/Library/Frameworks/Python.framework/Versions/2.$v/include/python2.$v/" + # Mac OS X [Fink]: + elif test "(" -f "/sw/lib/python2.$v/config/libpython2.$v.dylib" \ + -o -f "/sw/lib/python2.$v/config/libpython2.$v.a" \ + -o -f "/sw/lib/python2.$v/config/libpython2.$v.so" \ + ")" \ + -a -f "/sw/include/python2.$v/Python.h" \ + -a -f "/sw/lib/python2.$v/site-packages/PIL/_imaging.so";then + PY_VERSION=2.$v + PYTHON_LIB="-L /sw/lib/python2.$v/config/ -lpython$PY_VERSION /sw/lib/python2.$v/site-packages/PIL/_imaging.so" + PYTHON_INCLUDES="-I /sw/include/python2.$v/" + fi + done fi if test "x$PY_VERSION" "!=" "x"; then - echo "$as_me:$LINENO: result: python$PY_VERSION" >&5 -echo "${ECHO_T}python$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" - fi - if test "x$PYTHON_INCLUDES" = "x";then - PYTHON_INCLUDES="-I/usr/include/python$PY_VERSION" - fi + echo "$as_me:$LINENO: result: $PY_VERSION" >&5 +echo "${ECHO_T}$PY_VERSION" >&6 export PYTHON_INCLUDES PYTHON_LIB @@ -11506,10 +11583,10 @@ echo $ECHO_N "checking whether we can compile the python test program... $ECHO_C #include #include -int main(int argn, char*argv) +int main() { int ret; - ret = Py_Main(argn, argv); + ret = Py_Main(0, 0); int x; // check also for gcc 2.95.x incompatibilities return ret; } @@ -11547,36 +11624,41 @@ echo $ECHO_N "checking for missing libraries... $ECHO_C" >&6 if test "x$ZLIBMISSING" = "xtrue";then MISSINGLIBS="${MISSINGLIBS} zlib" - DISABLEPNG2SWF=true; + DISABLEPNG2SWF=true + PARTIAL=true fi if test "x$JPEGLIBMISSING" = "xtrue";then MISSINGLIBS="${MISSINGLIBS} jpeglib" - DISABLEPDF2SWF=true; - DISABLEJPEG2SWF=true; + DISABLEPDF2SWF=true + DISABLEJPEG2SWF=true + PARTIAL=true fi if test "x$T1LIBMISSING" = "xtrue";then MISSINGLIBS="${MISSINGLIBS} t1lib" fi -if test "x${ac_cv_header_jpeglib_h}" != "xyes"; then - DISABLEPDF2SWF=true; - DISABLEJPEG2SWF=true; - MISSINGLIBS="${MISSINGLIBS} jpeglib.h" +if test "x${ac_cv_header_jpeglib_h}" '!=' "xyes"; then + DISABLEPDF2SWF=true; + DISABLEJPEG2SWF=true; + MISSINGLIBS="${MISSINGLIBS} jpeglib.h" + PARTIAL=true fi -if test "x$HAVE_FREETYPE" != "x1"; then - DISABLEPDF2SWF=true; - MISSINGLIBS="${MISSINGLIBS} freetype" +if test "x$HAVE_FREETYPE" '!=' "x1"; then + DISABLEPDF2SWF=true; + MISSINGLIBS="${MISSINGLIBS} freetype" + PARTIAL=true fi -if test "x${ac_cv_header_t1lib_h}" != "xyes"; then - DISABLEPDF2SWF=true; - MISSINGLIBS="${MISSINGLIBS} t1lib.h" +if test "x${ac_cv_header_t1lib_h}" '!=' "xyes"; then + MISSINGLIBS="${MISSINGLIBS} t1lib.h" fi -if test "x${ac_cv_header_zlib_h}" != "xyes"; then - DISABLEPNG2SWF=true; - MISSINGLIBS="${MISSINGLIBS} zlib.h" +if test "x${ac_cv_header_zlib_h}" '!=' "xyes"; then + DISABLEPNG2SWF=true; + MISSINGLIBS="${MISSINGLIBS} zlib.h" + PARTIAL=true fi -if test "x${AVIFILE}" != "xtrue"; then - MISSINGLIBS="${MISSINGLIBS} avifile" +if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then + MISSINGLIBS="${MISSINGLIBS} avifile" + PARTIAL=true fi echo "$as_me:$LINENO: result: ${MISSINGLIBS}" >&5 @@ -11590,7 +11672,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= @@ -11627,6 +11709,9 @@ export PNG2SWF if test "x${MISSINGLIBS}" '!=' "x"; then + if test "x${PARTIAL}" '=' "x"; then + echo "* (never mind)" + fi echo "***************************************************" fi @@ -12000,7 +12085,7 @@ _ASBOX cat >&5 <<_CSEOF This file was extended by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.58. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -12060,7 +12145,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.59, +configured by $0, generated by GNU Autoconf 2.58, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2003 Free Software Foundation, Inc. @@ -12256,6 +12341,7 @@ s,@host@,$host,;t t s,@host_cpu@,$host_cpu,;t t s,@host_vendor@,$host_vendor,;t t s,@host_os@,$host_os,;t t +s,@SHARED@,$SHARED,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t @@ -12294,6 +12380,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 @@ -12421,43 +12509,40 @@ case $srcdir in ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; +case "$ac_dir" in +.) ac_abs_builddir=$ac_builddir;; *) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; + case $ac_builddir in + .) ac_abs_builddir="$ac_dir";; + [\\/]* | ?:[\\/]* ) ac_abs_builddir=$ac_builddir;; + *) ac_abs_builddir="$ac_dir"/$ac_builddir;; esac;; esac -case $ac_abs_builddir in +case "$ac_dir" in .) ac_abs_top_builddir=${ac_top_builddir}.;; *) case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; + .) ac_abs_top_builddir="$ac_dir";; [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + *) ac_abs_top_builddir="$ac_dir"/${ac_top_builddir}.;; esac;; esac -case $ac_abs_builddir in +case "$ac_dir" in .) ac_abs_srcdir=$ac_srcdir;; *) case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; + .) ac_abs_srcdir="$ac_dir";; [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + *) ac_abs_srcdir="$ac_dir"/$ac_srcdir;; esac;; esac -case $ac_abs_builddir in +case "$ac_dir" in .) ac_abs_top_srcdir=$ac_top_srcdir;; *) case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; + .) ac_abs_top_srcdir="$ac_dir";; [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + *) ac_abs_top_srcdir="$ac_dir"/$ac_top_srcdir;; esac;; esac