diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2007-09-27 01:36:36 +0400 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2007-09-27 01:36:36 +0400 |
| commit | ce97045b9b70306ccca84e47e4a516bd5545b6d8 (patch) | |
| tree | ec145746704e2c4644b68997686b4258599a2b70 /configure.in | |
| parent | 1e1c480b1af60f80ca32cb0c4c7ba691fbd4a14f (diff) | |
* configure.in: Another Mozilla detection tweak: don't ignore
pkg-config results.
svn path=/trunk/monodevelop/; revision=86450
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.in b/configure.in index e32f99aedd..166ac3690b 100644 --- a/configure.in +++ b/configure.in @@ -242,10 +242,10 @@ AM_CONDITIONAL(ENABLE_ASPNET, [test x$enable_aspnet = xyes]) #We need to know where Mozilla is for launch scripts and possible for AspNetEdit #Check pkg-config first MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`" -if test ! -e "$MOZILLA_HOME/libgtkembedmoz.so"; then +if test -z "$MOZILLA_HOME"; then MOZILLA_HOME="`$PKG_CONFIG --variable=libdir firefox-gtkmozembed`" fi -if test ! -e "$MOZILLA_HOME/libgtkembedmoz.so"; then +if test -z "$MOZILLA_HOME"; then MOZILLA_HOME="`$PKG_CONFIG --variable=libdir xulrunner-gtkmozembed`" fi @@ -275,7 +275,9 @@ find_libgtkembedmoz () done } -MOZILLA_HOME=`find_libgtkembedmoz` +if test -z "$MOZILLA_HOME"; then + MOZILLA_HOME=`find_libgtkembedmoz` +fi if test -z "$MOZILLA_HOME"; then MOZILLA_HOME= |