X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure.in;h=2377fe5368ce8d4c424905cb5e6babddc173f258;hp=ecd33a311a269fd455a758464583fdfbac4a26d5;hb=39c89e54a79dfc3fb950bf87b8998f824d75677b;hpb=1d5bfc54842481ae55acf0ed28feb636d549975a diff --git a/configure.in b/configure.in index ecd33a3..2377fe5 100644 --- a/configure.in +++ b/configure.in @@ -5,9 +5,17 @@ AC_ARG_ENABLE(checkmem, [ --enable-checkmem turn on ccmalloc debugging], CHECKMEM=true) AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging], DEBUG=true) +AC_ARG_ENABLE(optimizations, +[ --enable-optimizations turn on compiler optimizations (recommended for avi2swf)], OPTIMIZE=true) +AC_ARG_ENABLE(mp3, +[ --disable-mp3 don't compile any mp3 code in], NO_MP3=true) PACKAGE=swftools -VERSION=0.4.4-pre6 +VERSION=2004-02-01-1614 + + + + # -Winline? if test "x$CHECKMEM" '!=' "x";then @@ -16,10 +24,24 @@ fi if test "x$DEBUG" '!=' "x";then CFLAGS="-Wparentheses -Wimplicit -Wreturn-type -g $CFLAGS" CXXFLAGS="-Wparentheses -Wimplicit -Wreturn-type -g $CXXFLAGS" -else - CFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O -fomit-frame-pointer $CFLAGS" - CXXFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O -fomit-frame-pointer $CXXFLAGS" + STRIP="@echo debug enabled, not stripping " + export STRIP + AC_SUBST(STRIP) +else if test "x$OPTIMIZE" '!=' "x"; then + CFLAGS="-Wparentheses -Wimplicit -Wreturn-type -Winline -O3 -fomit-frame-pointer $CFLAGS" + CXXFLAGS="-Wparentheses -Wimplicit -Wreturn-type -Winline -O3 -fomit-frame-pointer $CXXFLAGS" + else + CFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O -fomit-frame-pointer $CFLAGS" + CXXFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O -fomit-frame-pointer $CXXFLAGS" + fi fi +#OLDGCC=1 +#if test "x$OLDGCC" '!=' "x";then +# #CFLAGS="$CFLAGS --std=c89 -ansi -pendantic" +# #CXXFLAGS="$CXXFLAGS --std=c89 -ansi -pendantic" +# CFLAGS="$CFLAGS -ansi -pendantic" +# CXXFLAGS="$CXXFLAGS -ansi -pendantic" +#fi export PACKAGE VERSION CFLAGS CXXFLAGS @@ -54,12 +76,16 @@ fi AC_PROG_LN_S AC_PROG_LIBTOOL AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, ) + AC_CHECK_PROGS(FREETYPE_CONFIG, freetype-config, ) # TODO: use this dnl Checks for system services AC_EXEEXT RFX_CHECK_MING +if test "x${MINGW}" != "xyes"; then + AC_DEFINE_UNQUOTED(O_BINARY, 0) +fi # The following tries to make use of includes and libraries in # /usr/local, too. Notice: A -I/usr/local/include might break # things (MingW, cross-compiling etc.) in the same way as -I/usr/include, @@ -73,6 +99,14 @@ if test -d /usr/local/include; then # CPPFLAGS="$CPPFLAGS -I/usr/local/include" echo > /dev/null fi +if test "$prefix" != "NONE" -a "$prefix" != "/usr/local" -a "$prefix" != "/usr/local/"; then + # if the user has a special prefix (like /opt), there might also be $prefix/lib + # and $prefix/include, which should be included in our search paths for libraries + # and includes. + LDFLAGS="$LDFLAGS -L${libdir}" + CPPFLAGS="$CPPFLAGS -I${includedir}" + # TODO- test whether gcc still works after this +fi dnl Checks for libraries. AC_CHECK_LIB(m, sin,, @@ -93,6 +127,9 @@ dnl Checks for libraries. DISABLEPDF2SWF=true; MISSINGLIBS="${MISSINGLIBS} t1lib" ) + AC_CHECK_LIB(freetype, FT_Init_FreeType, + USE_FREETYPE=true, + ) RFX_CHECK_BYTEORDER AC_SUBST(WORDS_BIGENDIAN) @@ -105,7 +142,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 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) if test "x${ac_cv_header_jpeglib_h}" != "xyes"; then DISABLEPDF2SWF=true; @@ -122,6 +159,9 @@ if test "x${ac_cv_header_zlib_h}" != "xyes"; then ZLIBMISSING=true; fi +if test "x$USE_FREETYPE" != "x"; then + AC_DEFINE_UNQUOTED(USE_FREETYPE, "$USE_FREETYPE") +fi AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -145,7 +185,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) + AC_CHECK_FUNCS(popen mkstemp stat lrand48 rand srand48 srand bcopy bzero) RFX_CHECK_AVI2SWF avi2swf="avi2swf/Makefile" @@ -156,14 +196,38 @@ if test "x${AVIFILE}" != "xtrue"; then avi2swf= fi +if test "x${NO_MP3}" == "x"; then + AC_DEFINE_UNQUOTED(USE_MP3, 1) +fi + +if test "x${USE_FREETYPE}" == "xtrue"; then + if test "x{$FREETYPE_CONFIG}" != "x"; then + ftinclude=`freetype-config --cflags` + ftlibs=`freetype-config --libs` + CXXFLAGS="$CXXFLAGS $ftinclude" + CFLAGS="$CFLAGS $ftinclude" + LIBS="$LIBS $ftlibs" + else if test -d /usr/include/freetype2; then + CXXFLAGS="$CXXFLAGS -I/usr/include/freetype2" + CFLAGS="$CFLAGS -I/usr/include/freetype2" + LIBS="$LIBS -lfreetype" + else if test -d /usr/local/include/freetype2; then + CXXFLAGS="$CXXFLAGS -I/usr/local/include/freetype2" + CFLAGS="$CFLAGS -I/usr/local/include/freetype2" + LIBS="$LIBS -L /usr/local/lib -lfreetype" + fi + fi + fi +fi + if test "x${UNCOMPRESS}" = "xgzip"; then AC_DEFINE_UNQUOTED(USE_GZIP, 1) fi AC_SUBST(USE_GZIP) -JPEG2SWF='jpeg2swf' #$(EXEEXT) +JPEG2SWF='jpeg2swf$(E)' export JPEG2SWF -PNG2SWF='png2swf' #$(EXEEXT) +PNG2SWF='png2swf$(E)' export PNG2SWF if test "x${DISABLEPDF2SWF}" = "xtrue"; then echo "***************************************************" @@ -189,9 +253,9 @@ if test "x${DISABLEPDF2SWF}" = "xtrue"; then echo "or write compressed Flash MX files!" fi echo "***************************************************" - FILES="./release Makefile.common ${avi2swf} Makefile lib/lame/Makefile lib/Makefile src/Makefile swfs/Makefile" + FILES="./release Makefile.common ${avi2swf} Makefile lib/lame/Makefile lib/Makefile lib/action/Makefile src/Makefile swfs/Makefile" else - FILES="./release Makefile.common ${avi2swf} Makefile lib/lame/Makefile lib/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/ttf2pt1/Makefile swfs/Makefile" + FILES="./release Makefile.common ${avi2swf} Makefile lib/lame/Makefile lib/Makefile lib/action/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/ttf2pt1/Makefile swfs/Makefile" fi AC_SUBST(JPEG2SWF) AC_SUBST(PNG2SWF)