X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure;h=4ca02585c73e34d866528f19c81e2697e2ec3aca;hp=c888a9b927c5fec261fa1aeb52babfc53da9516a;hb=e3f4172c72818b50c8be86ea072da5f3eadb2b62;hpb=7306cea52f69df550a21b3256803064da9544e39 diff --git a/configure b/configure index c888a9b..4ca0258 100755 --- a/configure +++ b/configure @@ -1847,6 +1847,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +# ------------------- option parsing ------------------------------- + +DEBUG= +CHECKMEM= +PROFILING= +ENABLE_WARNINGS= +OPTIMIZE= +DISABLE_LAME= + # Check whether --enable-checkmem was given. if test "${enable_checkmem+set}" = set; then enableval=$enable_checkmem; CHECKMEM=true @@ -1885,7 +1894,6 @@ fi PACKAGE=swftools VERSION=2009-08-12-1514 - # ------------------------------------------------------------------ if test "x${srcdir}" != "x."; then @@ -1893,9 +1901,9 @@ if test "x${srcdir}" != "x."; then exit 1 fi -WARNINGS="-Wparentheses -Wimplicit -Wreturn-type" +WARNINGS="-Wimplicit -Wreturn-type -Wno-write-strings -Wformat" if test "x$ENABLE_WARNINGS" '!=' "x";then - WARNINGS="-Wall -Wno-unused -Wno-format -Wno-redundant-decls -D_FORTIFY_SOURCE=2 " + WARNINGS="-Wall -Wno-unused -Wno-format -Wno-redundant-decls -Wno-write-strings -D_FORTIFY_SOURCE=2 " fi if test "x$CHECKMEM" '!=' "x";then @@ -1908,11 +1916,11 @@ if test "x$DEBUG" '!=' "x";then if test "x$PROFILING" = "x";then CFLAGS="$WARNINGS -O2 -g $CFLAGS" CXXFLAGS="$WARNINGS -O2 -g $CXXFLAGS" - LDFLAGS="-g $LIBS" + LDFLAGS="-g $LDFLAGS" else CFLAGS="$WARNINGS -O2 -g -pg $CFLAGS" CXXFLAGS="$WARNINGS -O2 -g -pg $CXXFLAGS" - LDFLAGS="-g -pg $LIBS" + LDFLAGS="-g -pg $LDFLAGS" fi else if test "x$OPTIMIZE" '!=' "x"; then CFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CFLAGS" @@ -4600,6 +4608,83 @@ fi fi +{ $as_echo "$as_me:$LINENO: checking for zzip_dir_fdopen in -lzzip" >&5 +$as_echo_n "checking for zzip_dir_fdopen in -lzzip... " >&6; } +if test "${ac_cv_lib_zzip_zzip_dir_fdopen+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lzzip $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char zzip_dir_fdopen (); +int +main () +{ +return zzip_dir_fdopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_lib_zzip_zzip_dir_fdopen=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_zzip_zzip_dir_fdopen=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_zzip_zzip_dir_fdopen" >&5 +$as_echo "$ac_cv_lib_zzip_zzip_dir_fdopen" >&6; } +if test "x$ac_cv_lib_zzip_zzip_dir_fdopen" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBZZIP 1 +_ACEOF + + LIBS="-lzzip $LIBS" + +else + ZZIPMISSING=true +fi + + { $as_echo "$as_me:$LINENO: checking for byte order" >&5 $as_echo_n "checking for byte order... " >&6; } @@ -5496,7 +5581,8 @@ done -for ac_header in zlib.h gif_lib.h io.h wchar.h jpeglib.h assert.h signal.h pthread.h sys/stat.h sys/mman.h sys/types.h dirent.h sys/bsdtypes.h sys/ndir.h sys/dir.h ndir.h time.h sys/time.h sys/resource.h pdflib.h + +for ac_header in zlib.h gif_lib.h io.h wchar.h jpeglib.h assert.h signal.h pthread.h sys/stat.h sys/mman.h sys/types.h dirent.h sys/bsdtypes.h sys/ndir.h sys/dir.h ndir.h time.h sys/time.h sys/resource.h pdflib.h zzip/lib.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -10107,7 +10193,7 @@ LIBPDF='libpdf$(A)' if test "x${DISABLEPDF2SWF}" = "xtrue"; then echo "* Disabling pdf2swf tool..." rm -f lib/pdf/Makefile - echo all install uninstall clean libpdf: > lib/pdf/Makefile + echo all install uninstall clean libpdf libgfxpdf: > lib/pdf/Makefile pdf2swf_makefile="" PDF2SWF= LIBPDF=