diff options
| author | Andreia Gaita <avidigal@novell.com> | 2008-06-14 03:36:59 +0400 |
|---|---|---|
| committer | Andreia Gaita <avidigal@novell.com> | 2008-06-14 03:36:59 +0400 |
| commit | b72633a7641df862e4168f9f223d3e981453b2d4 (patch) | |
| tree | f80637372d67eaba0d8e6c2e8e065e0614f8b51e /configure.in | |
| parent | 271543fd97585a1725feb3ebe0f899743c07dafe (diff) | |
* mono-tools/configure.in: Enable webkit and mono.webbrowser detection.
* mono-tools/docbrowser/browser.cs: Fix loader to not load all the
backends. Instead, try loading the selected engine, then the
fallback if the first fails, then any other available engine if the
fallback fails (and then throw hands in the air and give up).
Sprinkle try/catch blocks liberally.
* mono-tools/docbrowser/Makefile.am: Enable webkit detection.
2008-06-14 Andreia Gaita <avidigal@novell.com>
svn path=/trunk/mono-tools/; revision=105817
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 28db30b3..41d5ed90 100644 --- a/configure.in +++ b/configure.in @@ -10,6 +10,7 @@ dnl C# compiler AC_PATH_PROG(MCS, mcs, no) AC_PATH_PROG(GMCS, gmcs, no) AC_PATH_PROG(RUNTIME, mono, no) +AC_PATH_PROG(GACUTIL, gacutil, no) CS="C#" if test "x$MCS" = "xno" ; then @@ -31,6 +32,8 @@ AC_SUBST(MCS) AC_SUBST(GMCS) AC_SUBST(RUNTIME) AC_SUBST(RESGEN) +AC_SUBST(GACUTIL) + PKG_CHECK_MODULES(NUNIT, mono-nunit) AC_SUBST(NUNIT_LIBS) @@ -64,14 +67,34 @@ if test "x$enable_gecko" = "xyes"; then fi dnl TODO: check for webkit-sharp -AM_CONDITIONAL(ENABLE_WEBKIT, test "xno" = "xyes") +# AM_CONDITIONAL(ENABLE_WEBKIT, test "xno" = "xyes") +PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, enable_webkit=yes, enable_webkit=no) +AC_SUBST(WEBKIT_SHARP_LIBS) +AM_CONDITIONAL(ENABLE_WEBKIT, test "x$enable_webkit" = "xyes") # PKG_CHECK_MODULES(MONOWEBBROWSER, mono-webbrowser, enable_monowebbrowser=yes, enable_monowebbrowser=no) # AC_SUBST(MONOWEBBROWSER_LIBS) + +AC_MSG_CHECKING([for Mono.WebBrowser]) +if test "x$GACUTIL" = "xno" +then + AC_MSG_RESULT([no]) + if test "x$enable_monowebbrowser" = "x" ; then enable_monowebbrowser=no ; fi +else + if $GACUTIL -l Mono.WebBrowser | grep -q "Mono.WebBrowser" + then + AC_MSG_RESULT([yes]) + enable_monowebbrowser=yes + else + AC_MSG_RESULT([no]) + enable_monowebbrowser=no + fi +fi +MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser AM_CONDITIONAL(ENABLE_MONOWEBBROWSER, test "x$enable_monowebbrowser" = "xyes") -if test "x$enable_gtkhtml$enable_gecko$enable_monowebbrowser" = "xnono" ; then - AC_MSG_ERROR([no HTML display found. You need either gtkhtml, gecko or Mono.Mozilla]) +if test "x$enable_gtkhtml$enable_gecko$enable_monowebbrowser$enable_webkit" = "xnononono" ; then + AC_MSG_ERROR([no HTML display found. You need either gtkhtml, gecko, WebKit or Mono.WebBrowser]) fi dnl |