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

diff --git a/synfig-studio/trunk/configure.ac b/synfig-studio/trunk/configure.ac
index 5b33aae..d001cf8 100755
--- a/synfig-studio/trunk/configure.ac
+++ b/synfig-studio/trunk/configure.ac
@@ -6,7 +6,7 @@ AC_INIT([Synfig Studio],[0.61.08],[http://synfig.org/Bugs],[synfigstudio])
 AC_REVISION
 
 AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AC_CANONICAL_HOST
 dnl AC_CANONICAL_TARGET
 
@@ -28,7 +28,7 @@ AC_PROG_CPP
 AC_PROG_CXXCPP
 AC_PROG_INSTALL
 
-AC_LANG_CPLUSPLUS
+AC_LANG([C++])
 
 
 AC_ARG_DEBUG
@@ -66,7 +66,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 es"
+ALL_LINGUAS="ca fr es"
 AM_GNU_GETTEXT([external])
 # This is here so autoreconf will run autopoint
 AM_GNU_GETTEXT_VERSION([0.14.4])
@@ -109,14 +109,34 @@ PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 gthread-2.0,[
 		]
 	)
 	CXXFLAGS="$synfigstudio_save_cxxflags"
+	AC_MSG_CHECKING([for Gtk::AboutDialog::set_wrap_license])
+	synfigstudio_save_cxxflags="$CXXFLAGS"
+	CXXFLAGS="$GTKMM_CFLAGS $CXXFLAGS"
+	AC_COMPILE_IFELSE(
+		[
+			AC_LANG_PROGRAM([
+				[#include <gtkmm/aboutdialog.h>]
+			],[
+				[Gtk::AboutDialog about; about.set_wrap_license(true)]
+			])
+		],[
+			AC_MSG_RESULT([yes])
+			AC_DEFINE(HAVE_GTK_ABOUTDIALOG_SET_WRAP_LICENSE,[],[Define if GTKmm provides Gtk::AboutDialog::set_wrap_license()] )
+			AM_CONDITIONAL(HAVE_GTK_ABOUTDIALOG_SET_WRAP_LICENSE,true)
+		],[
+			AC_MSG_RESULT([no])
+			AM_CONDITIONAL(HAVE_GTK_ABOUTDIALOG_SET_WRAP_LICENSE,false)
+		]
+	)
+	CXXFLAGS="$synfigstudio_save_cxxflags"
 ],[
 	AC_MSG_ERROR([ ** Gtkmm-2.4 Is a required library, aborting.])
 ])
 AC_SUBST(GTKMM_CFLAGS)
 AC_SUBST(GTKMM_LIBS)
 
-PKG_CHECK_MODULES(SYNFIG, [synfig >= 0.61.07] [ETL >= 0.04.10] sigc++-2.0,,[
-	AC_MSG_ERROR([ ** Unable to set up dependent libraries (synfig >= 0.61.07, ETL >= 0.04.10)])
+PKG_CHECK_MODULES(SYNFIG, [synfig >= 0.61.08] [ETL >= 0.04.11] sigc++-2.0,,[
+	AC_MSG_ERROR([ ** Unable to set up dependent libraries (synfig >= 0.61.08, ETL >= 0.04.11)])
 ])
 AC_SUBST(SYNFIG_CFLAGS)
 AC_SUBST(SYNFIG_LIBS)
@@ -245,8 +265,7 @@ AC_SUBST(imageext)
 imagedir="${datadir}/pixmaps/synfigstudio"
 AC_SUBST(imagedir)
 
-AC_OUTPUT(
-Makefile
+AC_CONFIG_FILES([Makefile
 build_tools/Makefile
 doxygen.cfg
 po/Makefile.in
@@ -261,7 +280,8 @@ src/synfigapp/Makefile
 images/Makefile
 win32inst.nsi
 pkg-info/macosx/synfig-studio.info
-)
+])
+AC_OUTPUT
 
 # -- S U M M A R Y --------------------------------------------