From 383d977ef1a85b4b8085cdcf8390b0c22c24989b Mon Sep 17 00:00:00 2001 From: pabs Date: Mon, 3 Mar 2008 10:27:01 +0000 Subject: [PATCH] Check for Gtk::AboutDialog::set_wrap_license, which was added in Gtkmm 2.8. Allows synfigstudio to build on the fink distribution. git-svn-id: http://svn.voria.com/code@1851 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/configure.ac | 20 ++++++++++++++++++++ synfig-studio/trunk/src/gtkmm/about.cpp | 2 ++ 2 files changed, 22 insertions(+) diff --git a/synfig-studio/trunk/configure.ac b/synfig-studio/trunk/configure.ac index 8e61eba..60d8503 100755 --- a/synfig-studio/trunk/configure.ac +++ b/synfig-studio/trunk/configure.ac @@ -109,6 +109,26 @@ 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 ] + ],[ + [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.]) ]) diff --git a/synfig-studio/trunk/src/gtkmm/about.cpp b/synfig-studio/trunk/src/gtkmm/about.cpp index 3b5dad9..110fde1 100644 --- a/synfig-studio/trunk/src/gtkmm/about.cpp +++ b/synfig-studio/trunk/src/gtkmm/about.cpp @@ -123,7 +123,9 @@ About::About() "with this program; if not, write to the Free Software Foundation, Inc., " "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or visit: http://www.gnu.org/"; set_license(license); +#ifdef HAVE_GTK_ABOUTDIALOG_SET_WRAP_LICENSE set_wrap_license(true); +#endif std::vector authors; authors.push_back("Original developers:"); -- 2.7.4