Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/configure.ac b/synfig-studio/trunk/configure.ac
index 54bf1d8..dd93dbe 100755 (executable)
--- a/synfig-studio/trunk/configure.ac
+++ b/synfig-studio/trunk/configure.ac
@@ -2,11 +2,11 @@
 
 # -- I N I T --------------------------------------------------
 
-AC_INIT([Synfig Studio],[0.61.07],[http://synfig.org/Bugs],[synfigstudio])
+AC_INIT([Synfig Studio],[0.61.09],[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
 
@@ -17,7 +17,7 @@ API_VERSION=0.0
 
 # -- V A R I A B L E S ----------------------------------------
 
-SVN_REPOSITORY=http://svn.voria.com/code/synfig-studio
+SVN_REPOSITORY=https://synfig.svn.sourceforge.net/svnroot/synfig/synfig-studio
 
 # -- P R O G R A M S ------------------------------------------
 
@@ -28,7 +28,7 @@ AC_PROG_CPP
 AC_PROG_CXXCPP
 AC_PROG_INSTALL
 
-AC_LANG_CPLUSPLUS
+AC_LANG([C++])
 
 
 AC_ARG_DEBUG
@@ -66,10 +66,10 @@ 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 ru"
 AM_GNU_GETTEXT([external])
 # This is here so autoreconf will run autopoint
-AM_GNU_GETTEXT_VERSION([0.14.4])
+AM_GNU_GETTEXT_VERSION([0.15])
 
 case "$host" in
        *mingw* | *cygwin*)
@@ -79,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)
@@ -89,7 +90,8 @@ esac
 
 PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 gthread-2.0,[
        AC_MSG_CHECKING([for Gtk::AboutDialog::set_program_name])
-       CXXFLAGS="$GTKMM_CFLAGS"
+       synfigstudio_save_cxxflags="$CXXFLAGS"
+       CXXFLAGS="$GTKMM_CFLAGS $CXXFLAGS"
        AC_COMPILE_IFELSE(
                [
                        AC_LANG_PROGRAM([
@@ -106,14 +108,35 @@ PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 gthread-2.0,[
                        AM_CONDITIONAL(HAVE_GTK_ABOUTDIALOG_SET_PROGRAM_NAME,false)
                ]
        )
+       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.09] [ETL >= 0.04.12] sigc++-2.0,,[
+       AC_MSG_ERROR([ ** Unable to set up dependent libraries (synfig >= 0.61.09, ETL >= 0.04.12)])
 ])
 AC_SUBST(SYNFIG_CFLAGS)
 AC_SUBST(SYNFIG_LIBS)
@@ -242,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
@@ -258,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 --------------------------------------------