X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure.in;h=4673a19f1f06f8eb9a537a0afb205068db453c89;hp=9f6f5645c8a0f92b79d11f4dbaf74a3f3f65ae14;hb=d9872c4e9c1c252d74d380d114eeb769c043e013;hpb=04a3de0b6ac20ef5a88005d13eb1db56c99d7a33 diff --git a/configure.in b/configure.in index 9f6f564..4673a19 100644 --- a/configure.in +++ b/configure.in @@ -13,9 +13,10 @@ AC_ARG_ENABLE(lame, [ --disable-lame don't compile any L.A.M.E. mp3 encoding code in], DISABLE_LAME=true) PACKAGE=swftools -VERSION=0.5.0_pre1 +VERSION=0.5.1 -WARNINGS="-Wparentheses -Wimplicit -Wreturn-type -Winline" + +WARNINGS="-Wparentheses -Wimplicit -Wreturn-type" if test "x$ENABLE_WARNINGS" '!=' "x";then WARNINGS="-Wall -Wno-unused -Wno-format" fi @@ -26,12 +27,9 @@ fi if test "x$DEBUG" '!=' "x";then CFLAGS="$WARNINGS -g $CFLAGS" CXXFLAGS="$WARNINGS -g $CXXFLAGS" - STRIP="@echo debug enabled, not stripping " - export STRIP - AC_SUBST(STRIP) else if test "x$OPTIMIZE" '!=' "x"; then - CFLAGS="$WARNINGS -O3 -fomit-frame-pointer $CFLAGS" - CXXFLAGS="$WARNINGS -O3 -fomit-frame-pointer $CXXFLAGS" + CFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CFLAGS" + CXXFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CXXFLAGS" else CFLAGS="$WARNINGS -O -fomit-frame-pointer $CFLAGS" CXXFLAGS="$WARNINGS -O -fomit-frame-pointer $CXXFLAGS" @@ -60,7 +58,7 @@ esac dnl Checks for programs. AC_PROG_CC AC_PROG_CXX - + if test "x$CHECKMEM" '!=' "x";then CC="ccmalloc $CC" CXX="ccmalloc $CXX" @@ -109,6 +107,13 @@ if test "$prefix" != "NONE" -a "$prefix" != "/usr/local" -a "$prefix" != "/usr/l # TODO- test whether gcc still works after this fi +# this must be done after (I believe) AC_PROG_MAKE_SET +if test "x$DEBUG" '!=' "x";then + STRIP="@echo debug enabled, not stripping " + export STRIP + AC_SUBST(STRIP) +fi + dnl Checks for libraries. AC_CHECK_LIB(m, sin,, echo "Error: Math library not found."; @@ -142,7 +147,7 @@ dnl Checks for header files. AC_CONFIG_HEADER(config.h) AC_HEADER_DIRENT AC_HEADER_STDC - AC_CHECK_HEADERS(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) + AC_CHECK_HEADERS(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) if test "x${ac_cv_header_jpeglib_h}" != "xyes"; then DISABLEPDF2SWF=true; @@ -182,7 +187,7 @@ dnl Checks for typedefs, structures, and compiler characteristics. dnl AC_CHECK_TYPE(uint,unsigned long int) dnl Checks for library functions. - AC_CHECK_FUNCS(popen mkstemp stat lrand48 rand srand48 srand bcopy bzero) + AC_CHECK_FUNCS(popen mkstemp stat lrand48 rand srand48 srand bcopy bzero time) RFX_CHECK_AVI2SWF avi2swf="avi2swf/Makefile"