X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fconfigure.ac;h=e290def3a5dc5a967c7143c8ef72a5f23c10ed53;hb=392b62fa87099d8576a9da614be431a5046fe595;hp=26fd767cb9de910b65f8497e33adc1d85697265b;hpb=eb1582f29abe6a33c3380133badfabfc182534ea;p=synfig.git diff --git a/synfig-studio/trunk/configure.ac b/synfig-studio/trunk/configure.ac index 26fd767..e290def 100755 --- a/synfig-studio/trunk/configure.ac +++ b/synfig-studio/trunk/configure.ac @@ -59,7 +59,7 @@ 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="fr" +ALL_LINGUAS="fr es" AM_GNU_GETTEXT([external]) # This is here so autoreconf will run autopoint AM_GNU_GETTEXT_VERSION([0.14.4]) @@ -132,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],[],[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]) + ]) +]) + # -- H E A D E R S -------------------------------------------- AC_CHECK_HEADERS([unistd.h signal.h fcntl.h])