diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2007-09-26 Michael Hutchinson <mhutchinson@novell.com> + + * configure.in: Another Mozilla detection tweak: don't ignore pkg-config + results. + 2007-09-26 Lluis Sanchez Gual <lluis@novell.com> * monodevelop.png: New logo. 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= |