Author: mhutch
Date: 2007-09-26 17:28:38 -0400 (Wed, 26 Sep 2007)
New Revision: 86447
Modified:
branches/monodevelop/0.16/ChangeLog
branches/monodevelop/0.16/configure.in
Log:
* configure.in: Another Mozilla detection tweak: don't ignore
pkg-config results.
Modified: branches/monodevelop/0.16/ChangeLog
===================================================================
--- branches/monodevelop/0.16/ChangeLog 2007-09-26 21:25:01 UTC (rev 86446)
+++ branches/monodevelop/0.16/ChangeLog 2007-09-26 21:28:38 UTC (rev 86447)
@@ -1,3 +1,8 @@
+2007-09-26 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * configure.in: Another Mozilla detection tweak: don't ignore pkg-config
+ results.
+
2007-09-26 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* monodevelop.png: New logo.
Modified: branches/monodevelop/0.16/configure.in
===================================================================
--- branches/monodevelop/0.16/configure.in 2007-09-26 21:25:01 UTC (rev
86446)
+++ branches/monodevelop/0.16/configure.in 2007-09-26 21:28:38 UTC (rev
86447)
@@ -242,10 +242,10 @@
#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 @@
done
}
-MOZILLA_HOME=`find_libgtkembedmoz`
+if test -z "$MOZILLA_HOME"; then
+ MOZILLA_HOME=`find_libgtkembedmoz`
+fi
if test -z "$MOZILLA_HOME"; then
MOZILLA_HOME=
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches