X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fconfigure.ac;h=5b33aae97bbe77ed71862d86e98b428f4ae1c803;hb=ef6f90fbcc9ee541b6e5822a18754ed2749e9191;hp=ce4e74c4914f33e9f3a62c05f8fe7d9f9394c42c;hpb=0d7c50731bcd9fb694c4fec3ff345f6626bc35f9;p=synfig.git

diff --git a/synfig-studio/trunk/configure.ac b/synfig-studio/trunk/configure.ac
index ce4e74c..5b33aae 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.08],[http://synfig.org/Bugs],[synfigstudio])
 AC_REVISION
 
 AC_CONFIG_AUX_DIR(config)
@@ -22,6 +22,7 @@ SVN_REPOSITORY=http://svn.voria.com/code/synfig-studio
 # -- P R O G R A M S ------------------------------------------
 
 AC_PROG_CC
+AC_GNU_SOURCE
 AC_PROG_CXX
 AC_PROG_CPP
 AC_PROG_CXXCPP
@@ -31,12 +32,18 @@ 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
 AC_ARG_BRANCH_PROBABILITIES
 AC_ARG_PROFILING
-AC_ARG_LICENSE_KEY
 
 AC_ARG_ENABLE(g5opt,[
   --enable-g5opt           enable optimizations specific to G5 proc],[
@@ -56,11 +63,13 @@ AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 AC_LIBTOOL_PATCH
 
-
-
-
-
-dnl AC_PROG_INTLTOOL(0.11)
+## FIXME: add i18n for .desktop and other non-compiled files
+## AM_GLIB_GNU_GETTEXT([external])
+## AC_PROG_INTLTOOL(0.11)
+ALL_LINGUAS="fr es"
+AM_GNU_GETTEXT([external])
+# This is here so autoreconf will run autopoint
+AM_GNU_GETTEXT_VERSION([0.14.4])
 
 case "$host" in
 	*mingw* | *cygwin*)
@@ -70,6 +79,7 @@ case "$host" in
 	*darwin*)
 		AM_CONDITIONAL(WIN32_PKG, false)
 		AM_CONDITIONAL(MACOSX_PKG, true)
+		AC_DEFINE(USE_OPEN_FOR_URLS,[],[On MacOS X "open <URL>" works, on Linux it tries to open a virtual console.] )
 	;;
 	*)
 		AM_CONDITIONAL(WIN32_PKG, false)
@@ -78,7 +88,28 @@ case "$host" in
 esac
 # -- L I B R A R I E S ----------------------------------------
 
-PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 gthread-2.0,[],[
+PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 gthread-2.0,[
+	AC_MSG_CHECKING([for Gtk::AboutDialog::set_program_name])
+	synfigstudio_save_cxxflags="$CXXFLAGS"
+	CXXFLAGS="$GTKMM_CFLAGS $CXXFLAGS"
+	AC_COMPILE_IFELSE(
+		[
+			AC_LANG_PROGRAM([
+				[#include <gtkmm/aboutdialog.h>]
+			],[
+				[Gtk::AboutDialog about; about.set_program_name(PACKAGE_NAME)]
+			])
+		],[
+			AC_MSG_RESULT([yes])
+			AC_DEFINE(HAVE_GTK_ABOUTDIALOG_SET_PROGRAM_NAME,[],[Define if GTKmm provides Gtk::AboutDialog::set_program_name()] )
+			AM_CONDITIONAL(HAVE_GTK_ABOUTDIALOG_SET_PROGRAM_NAME,true)
+		],[
+			AC_MSG_RESULT([no])
+			AM_CONDITIONAL(HAVE_GTK_ABOUTDIALOG_SET_PROGRAM_NAME,false)
+		]
+	)
+	CXXFLAGS="$synfigstudio_save_cxxflags"
+],[
 	AC_MSG_ERROR([ ** Gtkmm-2.4 Is a required library, aborting.])
 ])
 AC_SUBST(GTKMM_CFLAGS)
@@ -130,6 +161,55 @@ if test $with_libfmod = "yes" ; then {
 	FMOD_LIBS=
 } ; fi
 
+# 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_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_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])
+	])
+])
+
 # -- H E A D E R S --------------------------------------------
 
 AC_CHECK_HEADERS([unistd.h signal.h fcntl.h])
@@ -167,7 +247,9 @@ AC_SUBST(imagedir)
 
 AC_OUTPUT(
 Makefile
-synfigstudio.spec
+build_tools/Makefile
+doxygen.cfg
+po/Makefile.in
 synfigstudio.desktop
 synfigstudio.mime
 synfigstudio.keys