[Gtk-sharp-list] allow gtkhtml build to be conditional

[John Luke]

--=-719VVLXvYgXFAjS/eixt
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hello everyone,

The attached patch adds a test for gtkhtml3 and will only build it if it
is installed.  It works here and I don't think it messes up any of the
other builds.  Also, it ups the libgda requirement from 0.90 to 1.0.0 
Let me know if it is ok to commit.

--=-719VVLXvYgXFAjS/eixt
Content-Disposition: attachment; filename=gtkhtml3-test.diff
Content-Type: text/x-patch; name=gtkhtml3-test.diff; charset=
Content-Transfer-Encoding: 7bit

Index: ChangeLog
===================================================================
RCS file: /cvs/public/gtk-sharp/ChangeLog,v
retrieving revision 1.554
diff -u -r1.554 ChangeLog
--- ChangeLog	17 Nov 2003 18:54:07 -0000	1.554
+++ ChangeLog	18 Nov 2003 04:11:03 -0000
@@ -1,3 +1,8 @@
+2003-11-18  John Luke  <jluke@cfl.rr.com>
+	
+	* configure.in: test for gtkhtml3
+	* gtkhtml/Makefile.in: build conditionally
+
 2003-11-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* gdk/Pixbuf.custom:
Index: configure.in
===================================================================
RCS file: /cvs/public/gtk-sharp/configure.in,v
retrieving revision 1.40
diff -u -r1.40 configure.in
--- configure.in	14 Nov 2003 19:14:31 -0000	1.40
+++ configure.in	18 Nov 2003 04:11:03 -0000
@@ -78,7 +78,7 @@
 	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 @@
 	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_rsvg" = "xyes"; then
+	BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS $RSVG_DEPENDENCIES_CFLAGS"
+	BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $RSVG_DEPENDENCIES_LIBS"
+fi
 
 AC_SUBST(BASE_DEPENDENCIES_CFLAGS)
 AC_SUBST(BASE_DEPENDENCIES_LIBS)
@@ -108,6 +114,8 @@
 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 "      * 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"
Index: gtkhtml/Makefile.in
===================================================================
RCS file: /cvs/public/gtk-sharp/gtkhtml/Makefile.in,v
retrieving revision 1.7
diff -u -r1.7 Makefile.in
--- gtkhtml/Makefile.in	28 Oct 2003 20:03:28 -0000	1.7
+++ gtkhtml/Makefile.in	18 Nov 2003 04:11:03 -0000
@@ -12,7 +12,8 @@
 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 && \

--=-719VVLXvYgXFAjS/eixt--