diff options
| author | Ben Maurer <benm@mono-cvs.ximian.com> | 2005-10-27 20:17:18 +0400 |
|---|---|---|
| committer | Ben Maurer <benm@mono-cvs.ximian.com> | 2005-10-27 20:17:18 +0400 |
| commit | 10b31218b1bd570ede5544d7c7da125c30dcee2a (patch) | |
| tree | 6b564ae1b8ece92a5d574999246a3b026a7c1d67 /configure.in | |
| parent | 3e4651222052c5c705b2d30f628695a48d519ee2 (diff) | |
In .:
2005-10-27 Ben Maurer <bmaurer@ximian.com>
* configure.in: Make gtkhtml an optional dependency
In docbrowser:
2005-10-27 Ben Maurer <bmaurer@ximian.com>
This removes the dependency on gtkhtml.
* Makefile.am: GtkHtml is put in its own assembly
* GtkHtmlHtmlRender.cs: Don't use a private api, so that we can
put this in another assembly
* browser.cs: gtkhtml rendering is now loaded dynamically
* GeckoHtmlRender.cs: Make printing optional
svn path=/trunk/mono-tools/; revision=52292
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 7dbb60ee..4409c99a 100644 --- a/configure.in +++ b/configure.in @@ -33,19 +33,29 @@ AC_SUBST(RESGEN) PKG_CHECK_MODULES(NUNIT, mono-nunit) AC_SUBST(NUNIT_LIBS) -#PKG_CHECK_MODULES(GTK_SHARP, glade-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0 gtkhtml-sharp-2.0, enable_gtks=yes, enable_gtks=no) +#PKG_CHECK_MODULES(GTK_SHARP, glade-sharp-2.0 gconf-sharp-2.0, enable_gtks=yes, enable_gtks=no) #if test "x$enable_gtks" = "xno" ; then - PKG_CHECK_MODULES(GTK_SHARP, glade-sharp gnome-sharp gconf-sharp gtkhtml-sharp, enable_gtks=yes, enable_gtks=no) + PKG_CHECK_MODULES(GTK_SHARP, glade-sharp gconf-sharp, enable_gtks=yes, enable_gtks=no) if test "x$enable_gtks" = "xno" ; then AC_MSG_ERROR([gtk-sharp not found]) fi #fi AC_SUBST(GTK_SHARP_LIBS) + +PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp, enable_gtkhtml=yes, enable_gtkhtml=no) +AC_SUBST(GTKHTML_SHARP_LIBS) +AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") + + PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp = 0.6, enable_gecko=yes, enable_gecko=no) AC_SUBST(GECKO_SHARP_LIBS) AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes") +if test "x$enable_gtkhtml$enable_gecko" = "xnono" ; then + AC_MSG_ERROR([no HTML display found. You need either gtkhtml or gecko]) +fi + dnl Intl GETTEXT_PACKAGE=mono-tools AC_SUBST(GETTEXT_PACKAGE) |