X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure.in;h=bc96ec5be4073236d62dd8f59cfe1f84cff03825;hb=51b0cb1e76475df853a3e9c8c8430fff9b971ab3;hp=f5f86488cfe3967b52d6bc847adc358c7f1c1132;hpb=e8aea812fa749bafe738f83c8ab76a33a00667a7;p=swftools.git diff --git a/configure.in b/configure.in index f5f8648..bc96ec5 100644 --- a/configure.in +++ b/configure.in @@ -21,7 +21,7 @@ AC_ARG_ENABLE(lame, [ --disable-lame don't compile any L.A.M.E. mp3 encoding code in], DISABLE_LAME=true) PACKAGE=swftools -VERSION=2006-05-01-1103 +VERSION=2007-01-10-2008 # ------------------------------------------------------------------ @@ -31,7 +31,7 @@ if test "x${srcdir}" != "x."; then exit 1 fi -WARNINGS="-Wparentheses -Wimplicit -Wreturn-type" +WARNINGS="-Wparentheses -Wimplicit -Wreturn-type -Wno-unused-value" if test "x$ENABLE_WARNINGS" '!=' "x";then WARNINGS="-Wall -Wno-unused -Wno-format -Wno-redundant-decls" fi @@ -44,8 +44,8 @@ if test "x$PROFILING" '!=' "x";then fi if test "x$DEBUG" '!=' "x";then if test "x$PROFILING" = "x";then - CFLAGS="$WARNINGS -O2 -g $CFLAGS" - CXXFLAGS="$WARNINGS -O2 -g $CXXFLAGS" + CFLAGS="$WARNINGS -O2 -g -D_FORTIFY_SOURCE=2 $CFLAGS" + CXXFLAGS="$WARNINGS -O2 -g -D_FORTIFY_SOURCE=2 $CXXFLAGS" else CFLAGS="$WARNINGS -O2 -g -pg $CFLAGS" CXXFLAGS="$WARNINGS -O2 -g -pg $CXXFLAGS" @@ -126,7 +126,6 @@ fi AC_PROG_MAKE_SET AC_PROG_INSTALL AC_PROG_LN_S - AC_PROG_LIBTOOL AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, ) dnl Checks for system services @@ -186,7 +185,7 @@ fi # this must be done after (I believe) AC_PROG_MAKE_SET -if test "x$DEBUG" '!=' "x";then +if test "x$DEBUG" '!=' "x" -o "x$STRIP" = "x";then STRIP="@echo debug enabled, not stripping " export STRIP AC_SUBST(STRIP) @@ -384,14 +383,14 @@ if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then avi2swf= fi -pdf2swf_makefile="pdf2swf/Makefile pdf2swf/xpdf/Makefile" +pdf2swf_makefile="lib/pdf/Makefile" PDF2SWF='pdf2swf$(E)' LIBPDF='libpdf$(A)' if test "x${DISABLEPDF2SWF}" = "xtrue"; then echo "* Disabling pdf2swf tool..." - rm -f pdf2swf/Makefile - echo all install uninstall clean: > pdf2swf/Makefile + rm -f lib/pdf/Makefile + echo all install uninstall clean: > lib/pdf/Makefile pdf2swf_makefile="" PDF2SWF= LIBPDF= @@ -439,7 +438,7 @@ 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} lib/art/Makefile" +FILES="$release_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile pdf2swf/fonts/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile" dnl old autoconf AC_OUTPUT(${FILES})