X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfigure.ac;h=868d248128fb983dbf51de9f86b315fec6e7624d;hb=392b62fa87099d8576a9da614be431a5046fe595;hp=aec847f1ff417a88bf90f8e10067d8709b91babc;hpb=991d45b68d8b19c075e5b16bb63b6b8898090341;p=synfig.git diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac index aec847f..868d248 100644 --- a/synfig-core/trunk/configure.ac +++ b/synfig-core/trunk/configure.ac @@ -2,7 +2,7 @@ # -- 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.07],[http://synfig.org/Bugs],[synfig]) AC_REVISION AC_CONFIG_AUX_DIR(config) @@ -338,7 +338,7 @@ AC_LIB_LTDL ALL_LINGUAS="es" AM_GNU_GETTEXT([external]) # This is here so autoreconf will run autopoint -AM_GNU_GETTEXT_VERSION([0.13]) +AM_GNU_GETTEXT_VERSION([0.14.4]) localedir="$datadir/locale" PKG_CHECK_MODULES(ETL, [ETL >= 0.04.10],,[ @@ -444,6 +444,36 @@ AC_SUBST(MODULE_DIR) SYNFIGLIB_DIR=$libdir/synfig AC_SUBST(SYNFIGLIB_DIR) +# Check for unordered_map or hash_map headers +AC_CHECK_HEADERS([tr1/unordered_map],[ + 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_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_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_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_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]) + ]) +]) +