X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fconfigure.ac;h=986df9a1c3bb8a210b9c935681c143984db79377;hb=d33059aae9748036c993c319e998b078124705d1;hp=e290def3a5dc5a967c7143c8ef72a5f23c10ed53;hpb=392b62fa87099d8576a9da614be431a5046fe595;p=synfig.git

diff --git a/synfig-studio/trunk/configure.ac b/synfig-studio/trunk/configure.ac
index e290def..986df9a 100755
--- a/synfig-studio/trunk/configure.ac
+++ b/synfig-studio/trunk/configure.ac
@@ -32,6 +32,13 @@ AC_LANG_CPLUSPLUS
 
 
 AC_ARG_DEBUG
+
+case "$debug" in
+	yes)
+		AC_DEFINE(SHOW_EXTRA_INFO,[],[Show extra info in the about dialog])
+	;;
+esac
+
 AC_ARG_OPTIMIZATION
 AC_ARG_WARNINGS
 AC_ARG_PROFILE_ARCS
@@ -133,26 +140,45 @@ 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<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_CHECK_HEADERS([tr1/unordered_set],[
+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.])
@@ -199,6 +225,7 @@ AC_SUBST(imagedir)
 
 AC_OUTPUT(
 Makefile
+build_tools/Makefile
 doxygen.cfg
 po/Makefile.in
 synfigstudio.desktop