X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fconfigure.ac;h=3e874cda91c19398d93fa65c72949869888ebd6d;hb=ef6f90fbcc9ee541b6e5822a18754ed2749e9191;hp=5fd4ecff25be536d9a38342da4a1f678eac3370b;hpb=eb1582f29abe6a33c3380133badfabfc182534ea;p=synfig.git

diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac
index 5fd4ecf..3e874cd 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://synfig.org/Bugs],[synfig])
+AC_INIT([Synfig Core],[0.61.08],[http://synfig.org/Bugs],[synfig])
 AC_REVISION
 
 AC_CONFIG_AUX_DIR(config)
@@ -335,7 +335,7 @@ 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])
@@ -444,11 +444,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<int,int>::const_iterator])
+AC_COMPILE_IFELSE([
+	AC_LANG_PROGRAM([
+		[#include <tr1/unordered_map>]
+	],[
+		[std::tr1::unordered_map<int,int>::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],[<tr1/unordered_map>],[The header file to include for unordered maps.])
+	AC_DEFINE([HASH_MAP_NAMESPACE],[std::tr1],[The namespace for unordered maps.])
+	AC_DEFINE([FUNCTIONAL_H],[<tr1/functional>],[The header file for hash<T>.])
+	AC_DEFINE([FUNCTIONAL_HASH_ON_STRING],[1],[Define to 1 if hash<T> 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],[<ext/hash_map>],[The header file to include for unordered maps.])
+		AC_DEFINE([HASH_MAP_NAMESPACE],[__gnu_cxx],[The namespace for unordered maps.])
+		AC_DEFINE([FUNCTIONAL_H],[<ext/functional>],[The header file for hash<T>.])
+	],[
+		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<int,int>::const_iterator])
+AC_COMPILE_IFELSE([
+	AC_LANG_PROGRAM([
+		[#include <tr1/unordered_set>]
+	],[
+		[std::tr1::unordered_set<int,int>::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],[<tr1/unordered_set>],[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],[<ext/hash_set>],[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)
 
@@ -487,9 +534,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],