Commited a patch from Gary Ekker, with additional suggestions from

Mike Kestner.
                                                                                                                         
email from Mike:
                                                                                                                         
On Wed, 2005-07-06 at 14:32 -0600, Gary Ekker wrote:
> Here's a patch for gtk-sharp2-1.9.5 and gtk-sharp-1.0.8 to find the
> new version of gtkhtml in SUSE
> 10. Wade and I added it yesterday to the SUSE build system.
>
> I didn't see anything on the sourceforge project page informing me how
> to send patches. Please let me know if there is a preferred method.
                                                                                                                         
I don't have a problem with something like this going upstream to trunk,
but it should require the latest release and it should be an = check
(not >=) because if past experience is any indicator, they'll be bumping
the so version every release.
                                                                                                                         
As far as the branch goes, you should probably just patch that until
they release 3.8.0, because I'd rather not do stable releases just to
support the latest unstable gtkhtml releases.
                                                                                                                         
Wade, feel free to commit to trunk with that s/>=/= change.
                                                                                                                         


svn path=/trunk/gtk-sharp/; revision=47313
This commit is contained in:
Wade Berrier 2005-07-14 16:59:27 +00:00
parent abcecb147f
commit 9d35f72e7c

View File

@ -169,6 +169,12 @@ 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.7.0
PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.8 = $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no)
if test "x$enable_gtkhtml" = "xyes"; then
GTKHTML_VERSION=3.8
GTKHTML_SOVERSION=15
else
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
@ -192,6 +198,7 @@ GTKHTML_SOVERSION=
fi
fi
fi
fi
AC_SUBST(GTKHTML_VERSION)
AC_SUBST(GTKHTML_SOVERSION)
else