X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure;h=ab0e946487527bbdb74fdafd493769c13ac6aa67;hb=f72efb3e0b08321fe70a478bf939c312ed7564ce;hp=33b0cf534f88c1fa6c04f31b2dce37a3fb528582;hpb=a57caaeafc5e9c815068e09b17af846f2684c245;p=swftools.git diff --git a/configure b/configure index 33b0cf5..ab0e946 100755 --- a/configure +++ b/configure @@ -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 VIDEO_LIBS VIDEO_CFLAGS 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 AREXT 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 GIF2SWF 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 @@ -1494,6 +1495,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 +1517,7 @@ if test "${enable_lame+set}" = set; then fi; PACKAGE=swftools -VERSION=2004-10-07-1814 +VERSION=0.7.0 # ------------------------------------------------------------------ @@ -1529,9 +1535,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 -O2 -g $CFLAGS" + CXXFLAGS="$WARNINGS -O2 -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" @@ -1550,7 +1565,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 @@ -1629,14 +1645,25 @@ 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" + CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS -fno-rtti" + SHARED="-bundle" + # Use fink packages if available. + #if test -d /sw/include && test -d /sw/lib; then + # CPPFLAGS="${CPPFLAGS} -I/sw/include" + # LDFLAGS="${LDFLAGS} -L/sw/lib" + #fi ;; esac + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4794,7 +4821,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4797 "configure"' > conftest.$ac_ext + echo '#line 4824 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5370,7 +5397,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5400: \"$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 @@ -6603,7 +6630,7 @@ linux-gnu*) libsuff= case "$host_cpu" in x86_64*) - echo '#line 6606 "configure"' > conftest.$ac_ext + echo '#line 6633 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7351,7 +7378,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ungif_DGifOpen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_ungif_DGifOpen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_DGifOpen" >&5 +echo "${ECHO_T}$ac_cv_lib_ungif_DGifOpen" >&6 +if test $ac_cv_lib_ungif_DGifOpen = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBUNGIF 1 +_ACEOF + + LIBS="-lungif $LIBS" + +else + UNGIFMISSING=true +fi + + echo "$as_me:$LINENO: checking for byte order" >&5 echo $ECHO_N "checking for byte order... $ECHO_C" >&6 @@ -9343,7 +9460,8 @@ fi -for ac_header in zlib.h jpeglib.h t1lib.h assert.h signal.h pthread.h sys/stat.h sys/types.h dirent.h sys/bsdtypes.h sys/ndir.h sys/dir.h ndir.h time.h + +for ac_header in zlib.h gif_lib.h jpeglib.h t1lib.h assert.h signal.h pthread.h sys/stat.h sys/types.h dirent.h sys/bsdtypes.h sys/ndir.h sys/dir.h ndir.h time.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -10062,35 +10180,39 @@ done # ------------------------------------------------------------------ -for ac_prog in freetype-config -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 + +# Extract the first word of "freetype-config", so it can be a program name with args. +set dummy freetype-config; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_FREETYPE_CONFIG+set}" = set; then +if test "${ac_cv_path_FREETYPE_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$FREETYPE_CONFIG"; then - ac_cv_prog_FREETYPE_CONFIG="$FREETYPE_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH + case $FREETYPE_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_FREETYPE_CONFIG="$FREETYPE_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy=""$PATH:/usr/local/bin:/sw/bin:/opt/local/bin"" +for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_FREETYPE_CONFIG="$ac_prog" + ac_cv_path_FREETYPE_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_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 @@ -10099,13 +10221,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 @@ -10114,7 +10234,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 @@ -10182,8 +10306,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 @@ -10327,13 +10453,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 @@ -10477,13 +10604,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 @@ -10493,15 +10622,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 @@ -10892,7 +11021,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 @@ -11501,30 +11630,44 @@ echo $ECHO_N "checking for Python.h and PIL... $ECHO_C" >&6 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 + 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 - # OS X: - # /System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3/Python.h - # /Library/Python/2.3/_imaging.so + # 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 "/System/Library/Frameworks/Python.framework/Versions/2.$v/include/python2.$v/Python.h";then + #TODO: test for /System/Library/Frameworks/Python.framework/Versions/2.3/Python ? + PY_VERSION=2.$v + PYTHON_LIB="-framework Python" + if test -f "/Library/Python/2.$v/PIL/_imaging.so";then + PYTHON_LIB2="$PYTHON_LIB /Library/Python/2.$v/PIL/_imaging.so" + else + PYTHON_LIB2="$PYTHON_LIB" + fi + 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: $PY_VERSION" >&5 echo "${ECHO_T}$PY_VERSION" >&6 - if test "x$PYTHON_LIB" = "x";then - 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/$PY_VERSION" - fi export PYTHON_INCLUDES PYTHON_LIB @@ -11535,10 +11678,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; } @@ -11549,10 +11692,18 @@ EOF echo "${ECHO_T}yes" >&6 PYTHON_OK=yes else - echo "configure: failed program was:" >&5 - cat conftest.c >&5 - echo "$as_me:$LINENO: result: no" >&5 + ac_link='$CC $CPPFLAGS $CFLAGS $PYTHON_INCLUDES conftest.c $LDFLAGS ${PYTHON_LIB2} $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 + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + PYTHON_LIB="${PYTHON_LIB2}" + PYTHON_OK=yes + else + echo "configure: failed program was:" >&5 + cat conftest.c >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 + fi fi rm -f conftest* else @@ -11576,36 +11727,51 @@ 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$UNGIFMISSING" = "xtrue";then + DISABLEGIF2SWF=true + MISSINGLIBS="${MISSINGLIBS} ungif" + PARTIAL=true +fi if test "x${ac_cv_header_jpeglib_h}" '!=' "xyes"; then - DISABLEPDF2SWF=true; - DISABLEJPEG2SWF=true; - MISSINGLIBS="${MISSINGLIBS} jpeglib.h" + DISABLEPDF2SWF=true; + DISABLEJPEG2SWF=true; + MISSINGLIBS="${MISSINGLIBS} jpeglib.h" + PARTIAL=true fi if test "x$HAVE_FREETYPE" '!=' "x1"; then - DISABLEPDF2SWF=true; - MISSINGLIBS="${MISSINGLIBS} freetype" + DISABLEPDF2SWF=true; + MISSINGLIBS="${MISSINGLIBS} freetype" + PARTIAL=true fi if test "x${ac_cv_header_t1lib_h}" '!=' "xyes"; then - DISABLEPDF2SWF=true; - MISSINGLIBS="${MISSINGLIBS} t1lib.h" + MISSINGLIBS="${MISSINGLIBS} t1lib.h" +fi +if test "x${ac_cv_header_gif_lib_h}" '!=' "xyes"; then + DISABLEGIF2SWF=true + MISSINGLIBS="${MISSINGLIBS} gif_lib.h" + PARTIAL=true fi if test "x${ac_cv_header_zlib_h}" '!=' "xyes"; then - DISABLEPNG2SWF=true; - MISSINGLIBS="${MISSINGLIBS} zlib.h" + DISABLEPNG2SWF=true; + MISSINGLIBS="${MISSINGLIBS} zlib.h" + PARTIAL=true fi if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then - MISSINGLIBS="${MISSINGLIBS} avifile" + MISSINGLIBS="${MISSINGLIBS} avifile" + PARTIAL=true fi echo "$as_me:$LINENO: result: ${MISSINGLIBS}" >&5 @@ -11647,6 +11813,14 @@ fi export JPEG2SWF +GIF2SWF='gif2swf$(E)' +if test "x${DISABLEGIF2SWF}" = "xtrue"; then + echo "* Disabling gif2swf tool..." + GIF2SWF= +fi +export GIF2SWF + + PNG2SWF='png2swf$(E)' if test "x${DISABLEPNG2SWF}" = "xtrue"; then echo "* Disabling png2swf tool..." @@ -11656,13 +11830,16 @@ export PNG2SWF if test "x${MISSINGLIBS}" '!=' "x"; then + if test "x${PARTIAL}" '=' "x"; then + echo "* (never mind)" + fi echo "***************************************************" fi # ------------------------------------------------------------------ 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}" +FILES="$release_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile" ac_config_files="$ac_config_files ${FILES}" @@ -12285,6 +12462,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 @@ -12309,6 +12487,7 @@ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@EGREP@,$EGREP,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@UNCOMPRESS@,$UNCOMPRESS,;t t +s,@AREXT@,$AREXT,;t t s,@AR@,$AR,;t t s,@SLEXT@,$SLEXT,;t t s,@target@,$target,;t t @@ -12329,6 +12508,7 @@ s,@USE_GZIP@,$USE_GZIP,;t t s,@PYTHON_LIB@,$PYTHON_LIB,;t t s,@PYTHON_INCLUDES@,$PYTHON_INCLUDES,;t t s,@JPEG2SWF@,$JPEG2SWF,;t t +s,@GIF2SWF@,$GIF2SWF,;t t s,@PNG2SWF@,$PNG2SWF,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t @@ -12824,3 +13004,25 @@ if test "$no_create" != yes; then fi +# +# On development trees, create snapshots of config.status +# +if test -f snapshot -a "x$CHECKMEM" = "x" -a "x$PROFILING" = "x";then + if test "x${MINGW}" = "xyes"; then + echo cp config.status config.status.win32 + cp config.status config.status.win32 + else + if test "x$DEBUG" '=' "x" -a "x$OPTIMIZE" '=' "x";then + echo cp config.status config.status.linux + cp config.status config.status.linux + fi + if test "x$DEBUG" '!=' "x" -a "x$OPTIMIZE" '=' "x";then + echo cp config.status config.status.debug + cp config.status config.status.debug + fi + if test "x$DEBUG" = "x" -a "x$OPTIMIZE" '!=' "x"; then + echo cp config.status config.status.optimize + cp config.status config.status.optimize + fi + fi +fi