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 /configure.in | |
| 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 'configure.in')
| -rw-r--r-- | configure.in | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 4409c99a..70520c7c 100644 --- a/configure.in +++ b/configure.in @@ -33,13 +33,12 @@ AC_SUBST(RESGEN) PKG_CHECK_MODULES(NUNIT, mono-nunit) AC_SUBST(NUNIT_LIBS) -#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 gconf-sharp, enable_gtks=yes, enable_gtks=no) - if test "x$enable_gtks" = "xno" ; then - AC_MSG_ERROR([gtk-sharp not found]) - fi -#fi +PKG_CHECK_MODULES(MONODOC, monodoc) +AC_SUBST(MONODOC_LIBS) + + +#PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0 gconf-sharp-2.0) +PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp glade-sharp gconf-sharp) AC_SUBST(GTK_SHARP_LIBS) @@ -52,6 +51,13 @@ PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp = 0.6, enable_gecko=yes, enable_gecko AC_SUBST(GECKO_SHARP_LIBS) AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes") +if test "x$enable_gecko" = "xyes"; then + # get the mozilla home directory + MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`" + AC_SUBST(MOZILLA_HOME) +fi + + if test "x$enable_gtkhtml$enable_gecko" = "xnono" ; then AC_MSG_ERROR([no HTML display found. You need either gtkhtml or gecko]) fi |