X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfigure.ac;h=3f1b7b63d4a0cff01a8c1aa695bddc0e7117c3a8;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=6eb99c9aa6c425db7fb9186d64acd59faada6b29;hpb=5f62dd661efb917a65fd4ab23b4bc4af56350dc8;p=synfig.git diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac index 6eb99c9..3f1b7b6 100644 --- a/synfig-core/trunk/configure.ac +++ b/synfig-core/trunk/configure.ac @@ -2,11 +2,11 @@ # -- I N I T -------------------------------------------------- -AC_INIT([Synfig Core],[0.61.07],[http://sourceforge.net/tracker/?group_id=144022&atid=757416],[synfig]) +AC_INIT([Synfig Core],[0.61.09],[http://synfig.org/Bugs],[synfig]) AC_REVISION AC_CONFIG_AUX_DIR(config) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST dnl AC_CANONICAL_TARGET @@ -27,9 +27,10 @@ AC_DEFINE(LT_SCOPE,[extern],[LibLTDL is linked staticly]) # -- V A R I A B L E S ---------------------------------------- -SVN_REPOSITORY=http://svn.voria.com/code/synfig-core +SVN_REPOSITORY=https://synfig.svn.sourceforge.net/svnroot/synfig/synfig-core AC_SUBST(SVN_REPOSITORY) + # -- P R O G R A M S ------------------------------------------ AC_PROG_CC @@ -39,20 +40,20 @@ AC_PROG_CPP AC_PROG_CXXCPP AC_PROG_INSTALL -AC_LANG_CPLUSPLUS +AC_LANG([C++]) + +AC_C_BIGENDIAN # -- A R G U M E N T S ---------------------------------------- -AC_ARG_TIMELIMIT AC_ARG_DEBUG AC_ARG_OPTIMIZATION AC_ARG_WARNINGS AC_ARG_PROFILING AC_ARG_PROFILE_ARCS AC_ARG_BRANCH_PROBABILITIES -dnl AC_ARG_LICENSE_KEY AC_ARG_ENABLE(g5opt,[ --enable-g5opt enable optimizations specific to G5 proc],[ @@ -248,6 +249,51 @@ if test $with_libavcodec = "yes" ; then { } ; fi +if test $with_libavcodec = "yes" ; then { + + # Need to check both the new and old locations for the avformat header + # Need to save flags, add avformat flags, check headers and restore flags + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_CFLAGS="$CFLAGS" + CPPFLAGS="${CPPFLAGS} ${LIBAVCODEC_CFLAGS}" + CFLAGS="${CFLAGS} ${LIBAVCODEC_CFLAGS}" + AC_CHECK_HEADERS(libavformat/avformat.h avformat.h ffmpeg/avformat.h) + CPPFLAGS="${ac_save_CPPFLAGS}" + CFLAGS="${ac_save_CFLAGS}" + + AC_ARG_WITH(libswscale, + [AS_HELP_STRING([--without-libswscale], + [disable support for libswscale (Default=auto)])], + [], + [with_libswscale="yes"] + ) + + if test $with_libswscale != "no" ; then { + PKG_CHECK_MODULES(LIBSWSCALE, [libswscale], [], [echo no; with_libswscale="no"]) + } ; fi + + if test $with_libswscale = "yes" ; then { + AC_DEFINE(WITH_LIBSWSCALE, [], [enable libswscale support]) + + # Need to check both the new and old locations for the swscale header + # Need to save flags, add swscale flags, check headers and restore flags + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_CFLAGS="$CFLAGS" + CPPFLAGS="${CPPFLAGS} ${LIBSWSCALE_CFLAGS}" + CFLAGS="${CFLAGS} ${LIBSWSCALE_CFLAGS}" + AC_CHECK_HEADERS(libswscale/swscale.h swscale.h ffmpeg/swscale.h) + CPPFLAGS="${ac_save_CPPFLAGS}" + CFLAGS="${ac_save_CFLAGS}" + } else { + AC_CHECK_LIB(avcodec, img_convert, + [AC_MSG_RESULT([ *** Using deprecated function img_convert.])], + [AC_MSG_FAILURE([Neither libswscale nor function img_convert was found.])], + [] + ) + } ; fi +} ; fi +AM_CONDITIONAL(WITH_LIBSWSCALE, test "x$with_libswscale" = "xyes") + # FREETYPE2 CHECK-------------------- @@ -308,8 +354,6 @@ AC_ARG_WITH(openexr,[ ]) if test $with_openexr = "yes" ; then { PKG_CHECK_MODULES(OPENEXR, OpenEXR,[ - CONFIG_DEPS="$CONFIG_DEPS OpenEXR" - AC_DEFINE(HAVE_OPENEXR,[], [ Define if OpenEXR is available ] ) AM_CONDITIONAL(WITH_OPENEXR,true) ], @@ -323,6 +367,7 @@ if test $with_openexr = "no" ; then { } ; fi if test $use_openexr_half = yes ; then { AC_MSG_RESULT([ ** Using OpenEXR Half.]) + CONFIG_DEPS="$CONFIG_DEPS OpenEXR" CONFIG_CFLAGS="$CONFIG_CFLAGS -DUSE_HALF_TYPE" OPENEXR_HALF_LIBS="-lHalf" } else { @@ -330,6 +375,19 @@ if test $use_openexr_half = yes ; then { } ; fi +# JPEG CHECK (commandline switch) ------------------------ +AC_ARG_WITH(jpeg,[ + --without-jpeg Disable support for JPEG],[ +],[ + with_jpeg="yes" +]) +if test $with_jpeg = "no" ; then { + AM_CONDITIONAL(WITH_JPEG,false) +} else { + AM_CONDITIONAL(WITH_JPEG,true) +} ; fi + + @@ -337,14 +395,14 @@ if test $use_openexr_half = yes ; then { AC_LIB_LTDL -ALL_LINGUAS="" +ALL_LINGUAS="es fr ru" AM_GNU_GETTEXT([external]) # This is here so autoreconf will run autopoint -AM_GNU_GETTEXT_VERSION([0.13]) +AM_GNU_GETTEXT_VERSION([0.15]) localedir="$datadir/locale" -PKG_CHECK_MODULES(ETL, [ETL >= 0.04.10],,[ - AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.10 or greater).]) +PKG_CHECK_MODULES(ETL, [ETL >= 0.04.12],,[ + AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.12 or greater).]) ]) CONFIG_DEPS="$CONFIG_DEPS ETL" @@ -373,23 +431,8 @@ dnl PKG_CHECK_MODULES(GLIB, glib-2.0,[GLIB="yes"],[GLIB="no"]) -TARGET_TIF="yes" TARGET_PNG="yes" TARGET_MNG="yes" -TARGET_JPEG="yes" - -if test "$TARGET_TIF" != "disabled" ; then -AC_CHECK_LIB(tiff, TIFFClose,[ - TIF_LIBS="-ltiff" - AC_DEFINE(HAVE_LIBTIFF,[], [ Define if TIFF library is available ] ) - AC_SUBST(TIF_LIBS) - AM_CONDITIONAL(HAVE_LIBTIFF,true) -],[ - AC_MSG_RESULT([ *** TIFF Output target disabled]) - TARGET_TIF="no" - AM_CONDITIONAL(HAVE_LIBTIFF,false) -]) -fi AC_CHECK_LIB(png, png_write_row,[ PNG_LIBS="-lpng" @@ -420,23 +463,26 @@ AC_CHECK_LIB(mng, mng_initialize,[ AM_CONDITIONAL(HAVE_LIBMNG,false) ],[-lz -L${exec_prefix}/lib]) -AC_CHECK_LIB(jpeg, main,[ - JPEG_LIBS="-ljpeg" - AC_DEFINE(HAVE_LIBJPEG,[], [ Define if JPEG library is available ] ) - AC_SUBST(JPEG_LIBS) - AM_CONDITIONAL(HAVE_LIBJPEG,true) -],[ +# check for JPEG availability +if test $with_jpeg = "yes" ; then { + AC_CHECK_LIB(jpeg, jpeg_CreateCompress,[ + JPEG_LIBS="-ljpeg" + AC_DEFINE(HAVE_LIBJPEG,[], [ Define if JPEG library is available ] ) + AC_SUBST(JPEG_LIBS) + TARGET_JPEG="yes" + AM_CONDITIONAL(HAVE_LIBJPEG,true) + ],[ + AC_MSG_RESULT([ *** JPEG Output target disabled]) + TARGET_JPEG="no" + AM_CONDITIONAL(HAVE_LIBJPEG,false) + ],[ + -L${exec_prefix}/lib + ]) +} else { AC_MSG_RESULT([ *** JPEG Output target disabled]) TARGET_JPEG="no" AM_CONDITIONAL(HAVE_LIBJPEG,false) -],[-L${exec_prefix}/lib]) - - -dnl AC_CHECK_HEADERS(jpeglib.h,[],[ -dnl AC_MSG_RESULT([ *** JPEG Output target disabled]) -dnl TARGET_JPEG="no" -dnl AM_CONDITIONAL(HAVE_LIBJPEG,false) -dnl ]) +} ; fi @@ -446,11 +492,58 @@ AC_SUBST(MODULE_DIR) SYNFIGLIB_DIR=$libdir/synfig AC_SUBST(SYNFIGLIB_DIR) +# Check for unordered_map or hash_map headers +AC_MSG_CHECKING([for unordered_map::const_iterator]) +AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([ + [#include ] + ],[ + [std::tr1::unordered_map::const_iterator iter;] + ])],[ + AC_MSG_RESULT([yes]) + AC_DEFINE([HASH_MAP_CLASS],[HASH_MAP_NAMESPACE::unordered_map],[The template name for unordered maps.]) + AC_DEFINE([HASH_MAP_H],[],[The header file to include for unordered maps.]) + AC_DEFINE([HASH_MAP_NAMESPACE],[std::tr1],[The namespace for unordered maps.]) + AC_DEFINE([FUNCTIONAL_H],[],[The header file for hash.]) + AC_DEFINE([FUNCTIONAL_HASH_ON_STRING],[1],[Define to 1 if hash needs to use T=String rather than T=char* to hash strings.]) +],[ + AC_MSG_RESULT([no]) + AC_CHECK_HEADERS([ext/hash_map],[ + AC_DEFINE([HASH_MAP_CLASS],[HASH_MAP_NAMESPACE::hash_map],[The template name for unordered maps.]) + AC_DEFINE([HASH_MAP_H],[],[The header file to include for unordered maps.]) + AC_DEFINE([HASH_MAP_NAMESPACE],[__gnu_cxx],[The namespace for unordered maps.]) + AC_DEFINE([FUNCTIONAL_H],[],[The header file for hash.]) + ],[ + AC_MSG_ERROR([C++ compiler does not seem to support unordered containers]) + ]) +]) + +# Check for unordered_set or hash_set headers +AC_MSG_CHECKING([for unordered_set::const_iterator]) +AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([ + [#include ] + ],[ + [std::tr1::unordered_set::const_iterator iter;] + ])],[ + AC_MSG_RESULT([yes]) + AC_DEFINE([HASH_SET_CLASS],[HASH_SET_NAMESPACE::unordered_set],[The template name for unordered sets.]) + AC_DEFINE([HASH_SET_H],[],[The header file to include for unordered sets.]) + AC_DEFINE([HASH_SET_NAMESPACE],[std::tr1],[The namespace for unordered sets.]) +],[ + AC_MSG_RESULT([no]) + AC_CHECK_HEADERS([ext/hash_set],[ + AC_DEFINE([HASH_SET_CLASS],[HASH_SET_NAMESPACE::hash_set],[The template name for unordered sets.]) + AC_DEFINE([HASH_SET_H],[],[The header file to include for unordered sets.]) + AC_DEFINE([HASH_SET_NAMESPACE],[__gnu_cxx],[The namespace for unordered sets.]) + ],[ + AC_MSG_ERROR([C++ compiler does not seem to support unordered containers]) + ]) +]) -CXXFLAGS="$CXXFLAGS -fpermissive" AC_CHECK_HEADERS(signal.h termios.h sys/errno.h) @@ -474,6 +567,9 @@ esac # -- H E A D E R S -------------------------------------------- +AC_HEADER_SYS_WAIT +AC_CHECK_HEADERS([process.h io.h fcntl.h]) + # -- T Y P E S & S T R U C T S -------------------------------- # -- F U N C T I O N S ---------------------------------------- @@ -485,6 +581,7 @@ dnl ]) AC_CHECK_FUNCS([fork]) AC_CHECK_FUNCS([kill]) AC_CHECK_FUNCS([pipe]) +AC_CHECK_FUNCS([waitpid]) AC_CHECK_FUNCS( [isnan], @@ -525,6 +622,7 @@ AC_SUBST(CXXFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) +# this line is required for libtool 1.5.26 but must not be present for libtool 2.2.4... AC_CONFIG_SUBDIRS(libltdl) CONFIG_LIBS="-lsynfig" @@ -552,10 +650,9 @@ AC_SUBST(API_VERSION) synfigincludedir=$includedir/synfig-$API_VERSION AC_SUBST(synfigincludedir) -AC_OUTPUT( -synfig-config +AC_CONFIG_FILES([synfig-config +build_tools/Makefile synfig.pc -synfig.spec doxygen.cfg Makefile po/Makefile.in @@ -582,15 +679,18 @@ src/modules/mod_particle/Makefile src/modules/mod_png/Makefile src/modules/mod_ppm/Makefile src/modules/mod_yuv420p/Makefile +src/modules/mod_svg/Makefile +src/modules/example/Makefile src/tool/Makefile src/modules/synfig_modules.cfg examples/walk/Makefile examples/Makefile win32inst.nsi pkg-info/macosx/synfig-core.info -dnl src/modules/trgt_mpg/Makefile -dnl src/modules/mptr_mplayer/Makefile -) +]) +## src/modules/trgt_mpg/Makefile +## src/modules/mptr_mplayer/Makefile +AC_OUTPUT # -- S U M M A R Y -------------------------------------------- @@ -603,19 +703,18 @@ Install Prefix -------------------> $prefix Module directory -----------------> $moduledir Build Platform -------------------> $build Host Platform --------------------> $host -Time Limit -----------------------> $death_time Arc Profiling --------------------> $profile_arcs GProf Profiling ------------------> $profiling Debug Mode -----------------------> $debug ($debug_flags) Optimization ---------------------> $optimization PNG output target support --------> $TARGET_PNG MNG output target support --------> $TARGET_MNG -TIFF output target support -------> $TARGET_TIF JPEG output target support -------> $TARGET_JPEG ETL_CFLAGS -----------------------> $ETL_CFLAGS FreeType2 ------------------------> $with_freetype fontconfig -----------------------> $with_fontconfig libavcodec -----------------------> $with_libavcodec +libswscale -----------------------> $with_libswscale vImage ---------------------------> $with_vimage ImageMagick ----------------------> $with_imagemagick Magick++ -------------------------> $with_magickpp