From e71f1cda1776c494baa1d8583fb688bd69d38733 Mon Sep 17 00:00:00 2001 From: John Luke Date: Tue, 18 Nov 2003 19:57:05 +0000 Subject: [PATCH] 2003-11-18 John Luke * configure.in: test for gtkhtml3 * gtkhtml/Makefile.in: build conditionally svn path=/trunk/gtk-sharp/; revision=20184 --- ChangeLog | 5 +++++ configure.in | 11 ++++++++++- gtkhtml/Makefile.in | 3 ++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b66e66d4..05d6750d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-11-18 John Luke + + * configure.in: test for gtkhtml3 + * gtkhtml/Makefile.in: build conditionally + 2003-11-18 Mike Kestner * gdk/Pixbuf.custom : resurrect the stream/resource ctors. rename diff --git a/configure.in b/configure.in index 97e3f8e8e..63164e7bf 100644 --- a/configure.in +++ b/configure.in @@ -78,7 +78,7 @@ if test "x$enable_glade" = "xyes"; then BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $GLADE_DEPENDENCIES_LIBS" fi -LIBGDA_REQUIRED_VERSION=0.90 +LIBGDA_REQUIRED_VERSION=1.0.0 PKG_CHECK_MODULES(LIBGDA_DEPENDENCIES, libgda >= $LIBGDA_REQUIRED_VERSION, enable_gda=yes, enable_gda=no) enable_gnomedb=no if test "x$enable_gda" = "xyes"; then @@ -99,6 +99,12 @@ if test "x$enable_rsvg" = "xyes"; then BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $RSVG_DEPENDENCIES_LIBS" fi +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" = "xyes"; then + BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS $GTKHTML_DEPENDENCIES_CFLAGS" + BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $GTKHTML_DEPENDENCIES_LIBS" +fi AC_SUBST(BASE_DEPENDENCIES_CFLAGS) AC_SUBST(BASE_DEPENDENCIES_LIBS) @@ -108,6 +114,8 @@ AM_CONDITIONAL(ENABLE_GLADE, test "x$enable_glade" = "xyes") AM_CONDITIONAL(ENABLE_GDA, test "x$enable_gda" = "xyes") AM_CONDITIONAL(ENABLE_GNOMEDB, test "x$enable_gnomedb" = "xyes") AM_CONDITIONAL(ENABLE_RSVG, test "x$enable_rsvg" = "xyes") +AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") + AC_SUBST(CFLAGS) @@ -153,6 +161,7 @@ echo " * glade-sharp.dll: $enable_glade" echo " * gda-sharp.dll: $enable_gda" echo " * gnomedb-sharp.dll: $enable_gnomedb" echo " * rsvg-sharp.dll: $enable_rsvg " +echo " * gtkhtml-sharp.dll: $enable_gtkhtml " echo "" echo " NOTE: if any of the above say 'no' you may install the" echo " corresponding development packages for them, rerun" diff --git a/gtkhtml/Makefile.in b/gtkhtml/Makefile.in index b89182e7e..7d17b9031 100755 --- a/gtkhtml/Makefile.in +++ b/gtkhtml/Makefile.in @@ -12,7 +12,8 @@ RUNTIME=mono MCS=mcs ASSEMBLY=gtkhtml-sharp.dll -all: $(ASSEMBLY) +@ENABLE_GTKHTML_TRUE@ all: $(ASSEMBLY) +@ENABLE_GTKHTML_FALSE@ all: generated-stamp: gtkhtml-api.xml *.custom ../generator/gapi_codegen.exe Gtk.metadata $(RUNTIME) ../parser/gapi-fixup.exe --api=gtkhtml-api.xml --metadata=Gtk.metadata && \