From 54d88f4e35410839b8725a46585f5d3345e05554 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Tue, 15 Mar 2005 04:26:50 +0000 Subject: [PATCH] 2005-03-14 Mike Kestner * configure.in : rework the gtkhtml check for 3.6. svn path=/trunk/gtk-sharp/; revision=41822 --- ChangeLog | 4 ++++ configure.in | 35 ++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28e2fb912..720a7562e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-03-14 Mike Kestner + + * configure.in : rework the gtkhtml check for 3.6. + 2005-03-14 Dan Winship * gtk/TreeNode.cs (AddNode): add an overload that takes a position diff --git a/configure.in b/configure.in index 82e9b8dd2..c8a1000a7 100644 --- a/configure.in +++ b/configure.in @@ -169,29 +169,34 @@ RSVG_REQUIRED_VERSION=2.0.1 PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enable_rsvg=yes, enable_rsvg=no) if test "x$enable_gnome" = "xyes"; then +GTKHTML_REQUIRED_VERSION=3.6.0 +PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.6 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no) +if test "x$enable_gtkhtml" = "xyes"; then +GTKHTML_VERSION=3.6 +GTKHTML_SOVERSION=18 +else +GTKHTML_REQUIRED_VERSION=3.2.0 +PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.1 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no) +if test "x$enable_gtkhtml" = "xyes"; then +GTKHTML_VERSION=3.1 +GTKHTML_SOVERSION=11 +else GTKHTML_REQUIRED_VERSION=3.0.10 PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.0 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no) if test "x$enable_gtkhtml" = "xyes"; then - GTKHTML_VERSION=3.0 - GTKHTML_SOVERSION=4 +GTKHTML_VERSION=3.0 +GTKHTML_SOVERSION=4 else - GTKHTML_REQUIRED_VERSION=3.2.0 - PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.1 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no) - if test "x$enable_gtkhtml" = "xyes"; then - GTKHTML_VERSION=3.1 - GTKHTML_SOVERSION=11 - else - GTKHTML_VERSION= - GTKHTML_SOVERSION= - fi +GTKHTML_VERSION= +GTKHTML_SOVERSION= +fi fi -else - enable_gtkhtml=no - GTKHTML_VERSION= - GTKHTML_SOVERSION= fi AC_SUBST(GTKHTML_VERSION) AC_SUBST(GTKHTML_SOVERSION) +else +enable_gtkhtml=no +fi if test "x$enable_gnome" = "xyes"; then VTE_REQUIRED_VERSION=0.11.10