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

diff --git a/synfig-studio/trunk/configure.ac b/synfig-studio/trunk/configure.ac
index 7d861a2..e290def 100755
--- a/synfig-studio/trunk/configure.ac
+++ b/synfig-studio/trunk/configure.ac
@@ -2,7 +2,7 @@
 
 # -- I N I T --------------------------------------------------
 
-AC_INIT([Synfig Studio],[0.61.07],[http://sourceforge.net/tracker/?group_id=144022&atid=757416],[synfigstudio])
+AC_INIT([Synfig Studio],[0.61.07],[http://synfig.org/Bugs],[synfigstudio])
 AC_REVISION
 
 AC_CONFIG_AUX_DIR(config)
@@ -37,7 +37,6 @@ AC_ARG_WARNINGS
 AC_ARG_PROFILE_ARCS
 AC_ARG_BRANCH_PROBABILITIES
 AC_ARG_PROFILING
-AC_ARG_LICENSE_KEY
 
 AC_ARG_ENABLE(g5opt,[
   --enable-g5opt           enable optimizations specific to G5 proc],[
@@ -60,10 +59,10 @@ AC_LIBTOOL_PATCH
 ## FIXME: add i18n for .desktop and other non-compiled files
 ## AM_GLIB_GNU_GETTEXT([external])
 ## AC_PROG_INTLTOOL(0.11)
-ALL_LINGUAS=""
+ALL_LINGUAS="fr es"
 AM_GNU_GETTEXT([external])
 # This is here so autoreconf will run autopoint
-AM_GNU_GETTEXT_VERSION([0.15])
+AM_GNU_GETTEXT_VERSION([0.14.4])
 
 case "$host" in
 	*mingw* | *cygwin*)
@@ -133,6 +132,36 @@ if test $with_libfmod = "yes" ; then {
 	FMOD_LIBS=
 } ; fi
 
+# 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],[<tr1/unordered_map>],[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],[<ext/hash_map>],[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],[<tr1/unordered_set>],[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],[<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])
+	])
+])
+
 # -- H E A D E R S --------------------------------------------
 
 AC_CHECK_HEADERS([unistd.h signal.h fcntl.h])
@@ -170,8 +199,8 @@ AC_SUBST(imagedir)
 
 AC_OUTPUT(
 Makefile
+doxygen.cfg
 po/Makefile.in
-synfigstudio.spec
 synfigstudio.desktop
 synfigstudio.mime
 synfigstudio.keys