[Gtk-sharp-list] patch for gtkhtml-3.1

James Willcox james@ximian.com
Thu, 18 Mar 2004 20:42:36 -0500


--=-FwK+ujaZrkcjeEzIdWSu
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hey,

Here's a patch for configure.in to make it find gtkhtml-3.1 if you have
that installed instead of gtkhtml-3.0.  Ok to commit?

Thanks,
James

--=-FwK+ujaZrkcjeEzIdWSu
Content-Disposition: attachment; filename=gtksharp_jwillcox_gtkhtml31_v1.diff
Content-Type: text/x-patch; name=gtksharp_jwillcox_gtkhtml31_v1.diff; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: configure.in
===================================================================
RCS file: /cvs/public/gtk-sharp/configure.in,v
retrieving revision 1.49
diff -u -r1.49 configure.in
--- configure.in	18 Mar 2004 20:56:32 -0000	1.49
+++ configure.in	19 Mar 2004 01:09:14 -0000
@@ -129,6 +129,11 @@
 
 GTKHTML_REQUIRED_VERSION=3.0
 PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.0 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
+
+if test "x$enable_gtkhtml" = "xno"; then
+	PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.1 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
+fi
+
 if test "x$enable_gtkhtml" = "xyes"; then
 	BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS $GTKHTML_DEPENDENCIES_CFLAGS"
 	BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $GTKHTML_DEPENDENCIES_LIBS"

--=-FwK+ujaZrkcjeEzIdWSu--