[pan2: 9/23] Update build system gor Gtk3.
- From: Petr Kovář <pmkovar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2: 9/23] Update build system gor Gtk3.
- Date: Sun, 29 May 2011 13:04:18 +0000 (UTC)
commit 9620444fcf84e59a66916a80b4c2e922284d3147
Author: K. Haley <haleykd users sf net>
Date: Tue May 10 14:45:32 2011 -0600
Update build system gor Gtk3.
configure.in | 12 +++++++++++-
pan/gui/Makefile.am | 1 +
2 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/configure.in b/configure.in
index fdec8c9..1a181c8 100644
--- a/configure.in
+++ b/configure.in
@@ -47,6 +47,7 @@ dnl needed if you want to build Pan with spellchecking in the Post window.
GLIB_REQUIRED=2.14.0
GMIME_REQUIRED=2.4.0
GTK_REQUIRED=2.16.0
+GTK3_REQUIRED=3.0.0
GTKSPELL_REQUIRED=2.0.7
AC_SUBST(GLIB_REQUIRED)
AC_SUBST(GMIME_REQUIRED)
@@ -77,8 +78,17 @@ panlocaledir='${prefix}/${DATADIRNAME}/locale'
AM_PATH_GLIB_2_0($GLIB_REQUIRED,,exit 1,gobject gmodule gthread)
PKG_CHECK_MODULES([GMIME], [ gmime-2.6 >= $GMIME_REQUIRED ], [],
[PKG_CHECK_MODULES( [GMIME], [gmime-2.4 >= $GMIME_REQUIRED] )] )
-AM_PATH_GTK_2_0($GTK_REQUIRED,,exit 1,gthread)
+gtk_msg=no
+AC_ARG_WITH(gtk3, AC_HELP_STRING([--with-gtk3], [Enable gtk3 support]), [want_gtk3=$withval], [want_gtk3=yes])
+if test "x$want_gtk3" = "xyes" ; then
+ PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= $GTK3_REQUIRED],
+ [gtk_msg="yes >= $GTK3_REQUIRED"
+ AC_DEFINE(HAVE_GTK,[1],[GTK 3.0])]
+ )
+else
+ AM_PATH_GTK_2_0($GTK_REQUIRED,,exit 1,gthread)
+fi
gtkspell_msg=no
AC_ARG_WITH(gtkspell, AC_HELP_STRING([--with-gtkspell], [Enable gtkspell support]), [want_gtkspell=$withval], [want_gtkspell=yes])
diff --git a/pan/gui/Makefile.am b/pan/gui/Makefile.am
index ffbb094..9eef8cf 100644
--- a/pan/gui/Makefile.am
+++ b/pan/gui/Makefile.am
@@ -47,6 +47,7 @@ noinst_HEADERS = \
group-pane.h \
group-prefs.h \
group-prefs-dialog.h \
+ gtk_compat.h \
gui.h \
header-pane.h \
hig.h \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]