X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fconfigure.ac;h=60d850368a0b6dd0ae283cfdcc92a4a5c07240f6;hb=383d977ef1a85b4b8085cdcf8390b0c22c24989b;hp=54bf1d83f61f09cd5c22d5d67d5462ea5aca1c36;hpb=3aaa0f97639b12eb4fee879a8d540603c1ccdc1f;p=synfig.git diff --git a/synfig-studio/trunk/configure.ac b/synfig-studio/trunk/configure.ac index 54bf1d8..60d8503 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://synfig.org/Bugs],[synfigstudio]) +AC_INIT([Synfig Studio],[0.61.08],[http://synfig.org/Bugs],[synfigstudio]) AC_REVISION AC_CONFIG_AUX_DIR(config) @@ -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 " 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 ] + ],[ + [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)