2004-05-03 Mike Kestner <mkestner@ximian.com>

* configure.in : add some checks for gtkhtml-3.1 and use it if avail.
	* gtkhtml/gtkhtml-sharp.dll.config.in : deal with 3.1 versioning.

svn path=/trunk/gtk-sharp/; revision=26600
This commit is contained in:
Mike Kestner 2004-05-03 16:22:35 +00:00
parent ccad405077
commit ce48b61360
3 changed files with 21 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2004-05-03 Mike Kestner <mkestner@ximian.com>
* configure.in : add some checks for gtkhtml-3.1 and use it if avail.
* gtkhtml/gtkhtml-sharp.dll.config.in : deal with 3.1 versioning.
2004-05-03 Miguel de Icaza <miguel@ximian.com> 2004-05-03 Miguel de Icaza <miguel@ximian.com>
* gtkhtml/Gtk.metadata: Patch from Mike Kestner: make * gtkhtml/Gtk.metadata: Patch from Mike Kestner: make

View file

@ -155,6 +155,21 @@ PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enab
GTKHTML_REQUIRED_VERSION=3.0 GTKHTML_REQUIRED_VERSION=3.0
PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.0 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no) 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=2
else
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=4
else
GTKHTML_VERSION=
GTKHTML_SOVERSION=
fi
fi
AC_SUBST(GTKHTML_VERSION)
AC_SUBST(GTKHTML_SOVERSION)
VTE_REQUIRED_VERSION=0.11.10 VTE_REQUIRED_VERSION=0.11.10
PKG_CHECK_MODULES(VTE_DEPENDENCIES, vte >= $VTE_REQUIRED_VERSION, enable_vte=yes, enable_vte=no) PKG_CHECK_MODULES(VTE_DEPENDENCIES, vte >= $VTE_REQUIRED_VERSION, enable_vte=yes, enable_vte=no)

View file

@ -1,4 +1,4 @@
<configuration> <configuration>
<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="gtkhtml-3.0" target="libgtkhtml-3.0@LIB_PREFIX@.2@LIB_SUFFIX@"/> <dllmap dll="gtkhtml-3.0" target="libgtkhtml-@GTKHTML_VERSION@@LIB_PREFIX@.@GTKHTML_SOVERSION@@LIB_SUFFIX@"/>
</configuration> </configuration>