X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfigure.ac;h=2e7e7b054e443a8758a4e1cf5449e43eeebb2249;hb=2d09de1dc113f1366f06265a2a246263c4370920;hp=868d248128fb983dbf51de9f86b315fec6e7624d;hpb=392b62fa87099d8576a9da614be431a5046fe595;p=synfig.git diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac index 868d248..2e7e7b0 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://synfig.org/Bugs],[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 @@ -39,7 +39,7 @@ AC_PROG_CPP AC_PROG_CXXCPP AC_PROG_INSTALL -AC_LANG_CPLUSPLUS +AC_LANG([C++]) # -- A R G U M E N T S ---------------------------------------- @@ -306,8 +306,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) ], @@ -321,6 +319,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 { @@ -335,14 +334,14 @@ if test $use_openexr_half = yes ; then { AC_LIB_LTDL -ALL_LINGUAS="es" +ALL_LINGUAS="es fr" AM_GNU_GETTEXT([external]) # This is here so autoreconf will run autopoint 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" @@ -371,24 +370,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 ] ) @@ -445,26 +430,45 @@ SYNFIGLIB_DIR=$libdir/synfig AC_SUBST(SYNFIGLIB_DIR) # Check for unordered_map or hash_map headers -AC_CHECK_HEADERS([tr1/unordered_map],[ +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_CHECK_HEADERS([tr1/unordered_set],[ +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.]) @@ -478,8 +482,6 @@ AC_CHECK_HEADERS([tr1/unordered_set],[ -CXXFLAGS="$CXXFLAGS -fpermissive" - AC_CHECK_HEADERS(signal.h termios.h sys/errno.h) @@ -517,9 +519,6 @@ AC_CHECK_FUNCS([fork]) AC_CHECK_FUNCS([kill]) AC_CHECK_FUNCS([pipe]) AC_CHECK_FUNCS([waitpid]) -AC_CHECK_FUNCS([_spawnlp]) -AC_CHECK_FUNCS([_pipe]) -AC_CHECK_FUNCS([cwait]) AC_CHECK_FUNCS( [isnan], @@ -587,8 +586,7 @@ AC_SUBST(API_VERSION) synfigincludedir=$includedir/synfig-$API_VERSION AC_SUBST(synfigincludedir) -AC_OUTPUT( -synfig-config +AC_CONFIG_FILES([synfig-config synfig.pc doxygen.cfg Makefile @@ -622,9 +620,10 @@ 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 -------------------------------------------- @@ -643,7 +642,6 @@ 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