X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfigure.ac;h=992dfc58d22edbc1a0933f2be9922a1e0a52a504;hb=cede2ebda9fac39714e914268f6ecab52bb46b5f;hp=ab651c01b07ec8166c84af1a31140d566c82f4ea;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac index ab651c0..992dfc5 100644 --- a/synfig-core/trunk/configure.ac +++ b/synfig-core/trunk/configure.ac @@ -2,18 +2,18 @@ # -- 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.08],[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 AM_INIT_AUTOMAKE([nostdinc]) AM_MAINTAINER_MODE -AC_LIBLTDL_INSTALLABLE +AC_LIBLTDL_CONVENIENCE AC_SUBST(INCLTDL) AC_SUBST(LIBLTDL) @@ -39,20 +39,18 @@ AC_PROG_CPP AC_PROG_CXXCPP AC_PROG_INSTALL -AC_LANG_CPLUSPLUS +AC_LANG([C++]) # -- 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],[ @@ -337,14 +335,14 @@ if test $use_openexr_half = yes ; then { AC_LIB_LTDL -ALL_LINGUAS="en_AU" +ALL_LINGUAS="es fr" AM_GNU_GETTEXT([external]) # This is here so autoreconf will run autopoint -AM_GNU_GETTEXT_VERSION([0.16.1]) +AM_GNU_GETTEXT_VERSION([0.14.4]) 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.11],,[ + AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.11 or greater).]) ]) CONFIG_DEPS="$CONFIG_DEPS ETL" @@ -373,24 +371,10 @@ 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" AC_DEFINE(HAVE_LIBPNG,[], [ Define if PNG library is available ] ) @@ -446,11 +430,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 +505,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 +519,7 @@ dnl ]) AC_CHECK_FUNCS([fork]) AC_CHECK_FUNCS([kill]) AC_CHECK_FUNCS([pipe]) +AC_CHECK_FUNCS([waitpid]) AC_CHECK_FUNCS( [isnan], @@ -552,10 +587,8 @@ AC_SUBST(API_VERSION) synfigincludedir=$includedir/synfig-$API_VERSION AC_SUBST(synfigincludedir) -AC_OUTPUT( -synfig-config +AC_CONFIG_FILES([synfig-config synfig.pc -synfig.spec doxygen.cfg Makefile po/Makefile.in @@ -590,7 +623,8 @@ win32inst.nsi pkg-info/macosx/synfig-core.info dnl src/modules/trgt_mpg/Makefile dnl src/modules/mptr_mplayer/Makefile -) +]) +AC_OUTPUT # -- S U M M A R Y -------------------------------------------- @@ -603,14 +637,12 @@ 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