Author: mkestner
Date: 2005-03-07 13:38:55 -0500 (Mon, 07 Mar 2005)
New Revision: 41534
Modified:
branches/gtk-sharp-1-0-branch/gtk-sharp/ChangeLog
branches/gtk-sharp-1-0-branch/gtk-sharp/configure.in
Log:
2005-03-07 Mike Kestner <[EMAIL PROTECTED]>
* configure.in : hack configure to play nice with gtkhtml-3.5.7.
Modified: branches/gtk-sharp-1-0-branch/gtk-sharp/ChangeLog
===================================================================
--- branches/gtk-sharp-1-0-branch/gtk-sharp/ChangeLog 2005-03-07 17:12:00 UTC
(rev 41533)
+++ branches/gtk-sharp-1-0-branch/gtk-sharp/ChangeLog 2005-03-07 18:38:55 UTC
(rev 41534)
@@ -1,3 +1,7 @@
+2005-03-07 Mike Kestner <[EMAIL PROTECTED]>
+
+ * configure.in : hack configure to play nice with gtkhtml-3.5.7.
+
2005-03-03 Mike Kestner <[EMAIL PROTECTED]>
* glade/XML.custom : backport the multiple autoconnect "fix".
Modified: branches/gtk-sharp-1-0-branch/gtk-sharp/configure.in
===================================================================
--- branches/gtk-sharp-1-0-branch/gtk-sharp/configure.in 2005-03-07
17:12:00 UTC (rev 41533)
+++ branches/gtk-sharp-1-0-branch/gtk-sharp/configure.in 2005-03-07
18:38:55 UTC (rev 41534)
@@ -153,22 +153,29 @@
RSVG_REQUIRED_VERSION=2.0.1
PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION,
enable_rsvg=yes, enable_rsvg=no)
+GTKHTML_REQUIRED_VERSION=3.5.7
+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=15
+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
+fi
AC_SUBST(GTKHTML_VERSION)
AC_SUBST(GTKHTML_SOVERSION)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches