diff options
| author | Ben Maurer <benm@mono-cvs.ximian.com> | 2005-10-27 23:17:41 +0400 |
|---|---|---|
| committer | Ben Maurer <benm@mono-cvs.ximian.com> | 2005-10-27 23:17:41 +0400 |
| commit | f3d8e94aab4cd2284ea7dd4844c53b5bc305eaa7 (patch) | |
| tree | 57c837f2a704251ddb636c5407d486ed158b78d9 /docbrowser | |
| parent | 06ee57c0fe7dd78f8d911948034bfcbc35d66f18 (diff) | |
In .:
* configure.in (GTK_SHARP): simplify this check, since we are not
doing the dual 2.0/1.0 thing.
(MOZILLA_HOME): get the mozilla home dir from pkgconfig.
(MONODOC): Require monodoc in configure.in
2005-10-27 Ben Maurer <bmaurer@ximian.com>
In docbrowser:
* Makefile.am (monodocdir): Don't use -pkg, but rely on the stuff
from configure.in.
* monodoc.in: Set LD_LIBRARY_PATH to include gecko, borrowed from
Monodevelop.
svn path=/trunk/mono-tools/; revision=52298
Diffstat (limited to 'docbrowser')
| -rw-r--r-- | docbrowser/ChangeLog | 6 | ||||
| -rw-r--r-- | docbrowser/Makefile.am | 6 | ||||
| -rw-r--r-- | docbrowser/monodoc.in | 18 |
3 files changed, 27 insertions, 3 deletions
diff --git a/docbrowser/ChangeLog b/docbrowser/ChangeLog index ce8bb320..51c66aa6 100644 --- a/docbrowser/ChangeLog +++ b/docbrowser/ChangeLog @@ -1,5 +1,11 @@ 2005-10-27 Ben Maurer <bmaurer@ximian.com> + * Makefile.am (monodocdir): Don't use -pkg, but rely on the stuff + from configure.in. + + * monodoc.in: Set LD_LIBRARY_PATH to include gecko, borrowed from + Monodevelop. + * GeckoHtmlRender.cs: Use an error dialog. This removes the dependency on gtkhtml. diff --git a/docbrowser/Makefile.am b/docbrowser/Makefile.am index fae8ee1c..5b1fc625 100644 --- a/docbrowser/Makefile.am +++ b/docbrowser/Makefile.am @@ -40,10 +40,10 @@ admin_sources = \ $(srcdir)/admin.cs \ $(srcdir)/Contributions.cs -browser_assemblies = $(GTK_SHARP_LIBS) -pkg:monodoc -r:System.Web.Services +browser_assemblies = $(GTK_SHARP_LIBS) $(MONODOC_LIBS) -r:System.Web.Services # we insert gtkhtml libs if we have them for printing -geckorender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(GECKO_SHARP_LIBS) -pkg:monodoc -r:browser.exe -gtkhtmlrender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) -pkg:monodoc -r:browser.exe +geckorender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(GECKO_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe +gtkhtmlrender_assemblies = $(GTK_SHARP_LIBS) $(GTKHTML_SHARP_LIBS) $(MONODOC_LIBS) -r:browser.exe EXTRA_DIST = \ $(browser_sources) \ diff --git a/docbrowser/monodoc.in b/docbrowser/monodoc.in index 46a64598..ba6c32a2 100644 --- a/docbrowser/monodoc.in +++ b/docbrowser/monodoc.in @@ -62,4 +62,22 @@ case x$1 in ;; esac + +if test -n "$MOZILLA_FIVE_HOME"; then + MOZILLA_HOME=$MOZILLA_FIVE_HOME +elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then + MOZILLA_HOME=@MOZILLA_HOME@ +elif [ $(which mozilla) ] && grep MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then + MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla) | cut -d '"' -f 2) +elif [ $(which firefox) ] && grep MOZILLA_FIVE_HOME= "$(which firefox)" > /dev/null ; then + MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which firefox) | cut -d '"' -f 2) +fi + +if [ -n $LD_LIBRARY_PATH ]; then + export LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH +else + export LD_LIBRARY_PATH=$MOZILLA_HOME +fi + + exec @RUNTIME@ $monodocdir/browser.exe $OPTIONS "$@" $REST |