[gtkhtml] use gtk-3.0 if available
- From: Chenthill Palanisamy <pchen src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkhtml] use gtk-3.0 if available
- Date: Mon, 28 Jun 2010 09:52:56 +0000 (UTC)
commit c39b34f79bbc82fc9a77af993a864be8e12d9a1e
Author: Chenthill Palanisamy <pchenthill novell com>
Date: Mon Jun 28 15:19:45 2010 +0530
use gtk-3.0 if available
configure.ac | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e696a2e..a56a9cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,11 +9,21 @@ AC_CONFIG_SRCDIR(README)
PACKAGE=gtkhtml
dnl Required Package Versions
-m4_define([gtk_minimum_version], [2.20.0])
m4_define([gail_minimum_version], [1.1.0])
m4_define([enchant_minimum_version], [1.1.7])
m4_define([gnome_icon_theme_minimum_version], [2.22.0])
+dnl **********************************
+dnl GTK version
+dnl **********************************
+if $PKG_CONFIG --exists gtk+-3.0; then
+ GTK_PACKAGE="gtk+-3.0"
+ gtk_minimum_version="2.90.5"
+else
+ GTK_PACKAGE="gtk+-2.0"
+ gtk_minimum_version="2.20.0"
+fi
+
GTKHTML_API_VERSION=3.14
AC_DEFINE_UNQUOTED(GTKHTML_API_VERSION, "${GTKHTML_API_VERSION}", [GtkHTML API Version])
AC_SUBST(GTKHTML_API_VERSION)
@@ -146,7 +156,7 @@ AC_SUBST(GTHREAD_LIBS)
dnl **********************************
dnl GTKHTML modules
dnl **********************************
-GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant >= enchant_minimum_version gconf-2.0 iso-codes"
+GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= enchant_minimum_version gconf-2.0 iso-codes"
PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
AC_SUBST(GTKHTML_CFLAGS)
AC_SUBST(GTKHTML_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]