X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fconfigure.ac;h=2af021666ad2ff1cb9220708a352f633327ad272;hb=642da5cc12fe53a0d7678538db24ad4839ca56aa;hp=ab651c01b07ec8166c84af1a31140d566c82f4ea;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git

diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac
index ab651c0..2af0216 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://sourceforge.net/tracker/?group_id=144022&atid=757416],[synfig])
+AC_INIT([Synfig Core],[0.61.07],[http://synfig.org/Bugs],[synfig])
 AC_REVISION
 
 AC_CONFIG_AUX_DIR(config)
@@ -13,7 +13,7 @@ dnl AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([nostdinc])
 AM_MAINTAINER_MODE
 
-AC_LIBLTDL_INSTALLABLE
+AC_LIBLTDL_CONVENIENCE
 AC_SUBST(INCLTDL)
 AC_SUBST(LIBLTDL)
 
@@ -45,14 +45,12 @@ AC_LANG_CPLUSPLUS
 # -- A R G U M E N T S ----------------------------------------
 
 
-AC_ARG_TIMELIMIT
 AC_ARG_DEBUG
 AC_ARG_OPTIMIZATION
 AC_ARG_WARNINGS
 AC_ARG_PROFILING
 AC_ARG_PROFILE_ARCS
 AC_ARG_BRANCH_PROBABILITIES
-dnl AC_ARG_LICENSE_KEY
 
 AC_ARG_ENABLE(g5opt,[
   --enable-g5opt           enable optimizations specific to G5 proc],[
@@ -337,10 +335,10 @@ if test $use_openexr_half = yes ; then {
 
 AC_LIB_LTDL
 
-ALL_LINGUAS="en_AU"
+ALL_LINGUAS="es"
 AM_GNU_GETTEXT([external])
 # This is here so autoreconf will run autopoint
-AM_GNU_GETTEXT_VERSION([0.16.1])
+AM_GNU_GETTEXT_VERSION([0.14.4])
 localedir="$datadir/locale"
 
 PKG_CHECK_MODULES(ETL, [ETL >= 0.04.10],,[
@@ -446,11 +444,55 @@ 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_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_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)
 
@@ -474,6 +516,9 @@ esac
 
 # -- H E A D E R S --------------------------------------------
 
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS([process.h io.h fcntl.h])
+
 # -- T Y P E S & S T R U C T S --------------------------------
 
 # -- F U N C T I O N S ----------------------------------------
@@ -485,6 +530,10 @@ dnl ])
 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],
@@ -555,7 +604,6 @@ AC_SUBST(synfigincludedir)
 AC_OUTPUT(
 synfig-config
 synfig.pc
-synfig.spec
 doxygen.cfg
 Makefile
 po/Makefile.in
@@ -603,7 +651,6 @@ Install Prefix -------------------> $prefix
 Module directory -----------------> $moduledir
 Build Platform -------------------> $build
 Host Platform --------------------> $host
-Time Limit -----------------------> $death_time
 Arc Profiling --------------------> $profile_arcs
 GProf Profiling ------------------> $profiling
 Debug Mode -----------------------> $debug ($debug_flags)