Update configure.ac as suggested by autoupdate.

[synfig.git] / synfig-core / trunk / configure.ac

diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac
index 868d248..992dfc5 100644 (file)
--- a/synfig-core/trunk/configure.ac
+++ b/synfig-core/trunk/configure.ac
@@ -2,11 +2,11 @@
 
 # -- I N I T --------------------------------------------------
 
-AC_INIT([Synfig Core],[0.61.07],[http://synfig.org/Bugs],[synfig])
+AC_INIT([Synfig Core],[0.61.08],[http://synfig.org/Bugs],[synfig])
 AC_REVISION
 
 AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AC_CANONICAL_HOST
 dnl AC_CANONICAL_TARGET
 
@@ -39,7 +39,7 @@ AC_PROG_CPP
 AC_PROG_CXXCPP
 AC_PROG_INSTALL
 
-AC_LANG_CPLUSPLUS
+AC_LANG([C++])
 
 
 # -- A R G U M E N T S ----------------------------------------
@@ -335,14 +335,14 @@ if test $use_openexr_half = yes ; then {
 
 AC_LIB_LTDL
 
-ALL_LINGUAS="es"
+ALL_LINGUAS="es fr"
 AM_GNU_GETTEXT([external])
 # This is here so autoreconf will run autopoint
 AM_GNU_GETTEXT_VERSION([0.14.4])
 localedir="$datadir/locale"
 
-PKG_CHECK_MODULES(ETL, [ETL >= 0.04.10],,[
-       AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.10 or greater).])
+PKG_CHECK_MODULES(ETL, [ETL >= 0.04.11],,[
+       AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.11 or greater).])
 ])
 CONFIG_DEPS="$CONFIG_DEPS ETL"
 
@@ -371,24 +371,10 @@ dnl PKG_CHECK_MODULES(GLIB, glib-2.0,[GLIB="yes"],[GLIB="no"])
 
 
 
-TARGET_TIF="yes"
 TARGET_PNG="yes"
 TARGET_MNG="yes"
 TARGET_JPEG="yes"
 
-if test "$TARGET_TIF" != "disabled" ; then
-AC_CHECK_LIB(tiff, TIFFClose,[
-       TIF_LIBS="-ltiff"
-       AC_DEFINE(HAVE_LIBTIFF,[], [ Define if TIFF library is available ] )
-       AC_SUBST(TIF_LIBS)
-       AM_CONDITIONAL(HAVE_LIBTIFF,true)
-],[
-       AC_MSG_RESULT([ *** TIFF Output target disabled])
-       TARGET_TIF="no"
-       AM_CONDITIONAL(HAVE_LIBTIFF,false)
-])
-fi
-
 AC_CHECK_LIB(png, png_write_row,[
        PNG_LIBS="-lpng"
        AC_DEFINE(HAVE_LIBPNG,[], [ Define if PNG library is available ] )
@@ -445,26 +431,45 @@ SYNFIGLIB_DIR=$libdir/synfig
 AC_SUBST(SYNFIGLIB_DIR)
 
 # 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.])
@@ -478,8 +483,6 @@ AC_CHECK_HEADERS([tr1/unordered_set],[
 
 
 
-CXXFLAGS="$CXXFLAGS -fpermissive"
-
 AC_CHECK_HEADERS(signal.h termios.h sys/errno.h)
 
 
@@ -517,9 +520,6 @@ 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],
@@ -587,8 +587,7 @@ AC_SUBST(API_VERSION)
 synfigincludedir=$includedir/synfig-$API_VERSION
 AC_SUBST(synfigincludedir)
 
-AC_OUTPUT(
-synfig-config
+AC_CONFIG_FILES([synfig-config
 synfig.pc
 doxygen.cfg
 Makefile
@@ -624,7 +623,8 @@ win32inst.nsi
 pkg-info/macosx/synfig-core.info
 dnl src/modules/trgt_mpg/Makefile
 dnl src/modules/mptr_mplayer/Makefile
-)
+])
+AC_OUTPUT
 
 # -- S U M M A R Y --------------------------------------------
 
@@ -643,7 +643,6 @@ Debug Mode -----------------------> $debug ($debug_flags)
 Optimization ---------------------> $optimization
 PNG output target support --------> $TARGET_PNG
 MNG output target support --------> $TARGET_MNG
-TIFF output target support -------> $TARGET_TIF
 JPEG output target support -------> $TARGET_JPEG
 ETL_CFLAGS -----------------------> $ETL_CFLAGS
 FreeType2 ------------------------> $with_freetype