From b201ed07fdddc8d3c2688955a5cf0a04c433b2ba Mon Sep 17 00:00:00 2001 From: dooglus Date: Sun, 27 Jan 2008 11:54:10 +0000 Subject: [PATCH] The same as r1506 but for studio as well. r1506 only addressed the problem for core. git-svn-id: http://svn.voria.com/code@1509 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/configure.ac | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/synfig-studio/trunk/configure.ac b/synfig-studio/trunk/configure.ac index e290def..2518b76 100755 --- a/synfig-studio/trunk/configure.ac +++ b/synfig-studio/trunk/configure.ac @@ -133,11 +133,19 @@ if test $with_libfmod = "yes" ; then { } ; fi # 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_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.]) @@ -148,11 +156,19 @@ AC_CHECK_HEADERS([tr1/unordered_map],[ ]) # 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.]) -- 2.7.4