Author: mhutch
Date: 2006-11-28 18:40:25 -0500 (Tue, 28 Nov 2006)
New Revision: 68628
Modified:
trunk/monodevelop/ChangeLog
trunk/monodevelop/Makefile.am
trunk/monodevelop/configure.in
trunk/monodevelop/monodevelop.in
Log:
2006-11-28 Andr?\195?\169s G. Aragoneses <[EMAIL PROTECTED]>
* configure.in: Added a fallback search for MOZILLA_HOME, that is in
sync with the one in monodevelop.in. Reviewed and cleaned up by
Michael Hutchinson <[EMAIL PROTECTED]>.
* monodevelop.in: Added a new way to detect MOZILLA_HOME, and improved
the existing ones. Incorporates patch by Mike Morano
<[EMAIL PROTECTED]>.
* Makefile.am: Set MOZILLA_FIVE_HOME for the "make run" command.
Modified: trunk/monodevelop/ChangeLog
===================================================================
--- trunk/monodevelop/ChangeLog 2006-11-28 23:08:03 UTC (rev 68627)
+++ trunk/monodevelop/ChangeLog 2006-11-28 23:40:25 UTC (rev 68628)
@@ -1,4 +1,17 @@
+2006-11-28 Andrés G. Aragoneses <[EMAIL PROTECTED]>
+
+ * configure.in: Added a fallback search for MOZILLA_HOME, that is in
+ sync with the one in monodevelop.in. Reviewed and cleaned up by
+ Michael Hutchinson <[EMAIL PROTECTED]>.
+
+ * monodevelop.in: Added a new way to detect MOZILLA_HOME, and improved
+ the existing ones. Incorporates patch by Mike Morano
+ <[EMAIL PROTECTED]>.
+
+ * Makefile.am: Set MOZILLA_FIVE_HOME for the "make run" command.
+
2006-11-28 Gideon de Swardt <[EMAIL PROTECTED]>
+
* configure.in: Added the WebReference AddIn.
2006-11-23 Lluis Sanchez Gual <[EMAIL PROTECTED]>
Modified: trunk/monodevelop/Makefile.am
===================================================================
--- trunk/monodevelop/Makefile.am 2006-11-28 23:08:03 UTC (rev 68627)
+++ trunk/monodevelop/Makefile.am 2006-11-28 23:40:25 UTC (rev 68628)
@@ -74,7 +74,7 @@
run: runmd
runmd: $(PROGRAM)
- cd build/bin && LD_LIBRARY_PATH=`echo
"$(LD_LIBRARY_PATH):$(MOZILLA_HOME)" | sed 's/^://g'` $(RUNTIME) --debug
MonoDevelop.exe
+ cd build/bin && MOZILLA_FIVE_HOME=$(MOZILLA_HOME) LD_LIBRARY_PATH=`echo
"$(LD_LIBRARY_PATH):$(MOZILLA_HOME)" | sed 's/^://g'` $(RUNTIME) --debug
MonoDevelop.exe
pad: $(MONOPAD)
Modified: trunk/monodevelop/configure.in
===================================================================
--- trunk/monodevelop/configure.in 2006-11-28 23:08:03 UTC (rev 68627)
+++ trunk/monodevelop/configure.in 2006-11-28 23:40:25 UTC (rev 68628)
@@ -258,7 +258,31 @@
# get zip to create jar/xpi for chrome
AC_PATH_PROG(ZIP, zip)
else
+ #We still need to know where Mozilla is for launch scripts, even though
we're not using JSCall#
+ #Check pkg-config first
MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
+ if !(test -n "$MOZILLA_HOME"); then
+ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir
firefox-gtkmozembed`"
+ fi
+
+ #if MOZILLA_HOME is still empty, try to detect without pkg_config
+ #(NOTE: any changes to this block should be kept in sync with the one
in monodevelop.in)
+ if !(test -n "$MOZILLA_HOME"); then
+ if test -n "$MOZILLA_FIVE_HOME"; then
+ MOZILLA_HOME=$MOZILLA_FIVE_HOME
+ elif grep GRE_PATH /etc/gre.d/*.conf > /dev/null ; then
+ MOZILLA_HOME=$(grep -h GRE_PATH= /etc/gre.d/*.conf |
cut -d '"' -f 2 -d = | head -n 1)
+ elif [ $(which mozilla 2>/dev/null) ] && grep
MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then
+ MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla)
| cut -d '"' -f 2 | cut -d '=' -f 2 )
+ elif [ $(which firefox 2>/dev/null) ] && grep
MOZILLA_FIVE_HOME= "$(which firefox)" > /dev/null ; then
+ MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which firefox)
| cut -d '"' -f 2 | cut -d '=' -f 2 )
+ elif [ $(which firefox 2>/dev/null) ] && grep MOZILLA_LIBDIR=
"$(which firefox)" > /dev/null ; then
+ MOZILLA_HOME=$(grep MOZILLA_LIBDIR= $(which firefox) |
cut -d '"' -f 2 | cut -d '=' -f 2)
+ else
+ AC_MSG_WARN([Cannot detect Mozilla library directory.
WelcomePage addin may not be able to function.])
+ fi
+ fi
+
AC_SUBST(MOZILLA_HOME)
fi
Modified: trunk/monodevelop/monodevelop.in
===================================================================
--- trunk/monodevelop/monodevelop.in 2006-11-28 23:08:03 UTC (rev 68627)
+++ trunk/monodevelop/monodevelop.in 2006-11-28 23:40:25 UTC (rev 68628)
@@ -16,16 +16,19 @@
echo "$ret"
}
+#(NOTE: any changes to this block should be kept in sync with the one in
configure.in)
if test -n "$MOZILLA_FIVE_HOME"; then
MOZILLA_HOME=$MOZILLA_FIVE_HOME
elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
[EMAIL PROTECTED]@
elif grep GRE_PATH /etc/gre.d/*.conf > /dev/null ; then
MOZILLA_HOME=$(grep -h GRE_PATH= /etc/gre.d/*.conf | cut -d '"' -f 2 -d
= | head -n 1)
-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)
+elif [ $(which mozilla 2>/dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which
mozilla)" > /dev/null ; then
+ MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla) | cut -d '"' -f
2 | cut -d '=' -f 2 )
+elif [ $(which firefox 2>/dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which
firefox)" > /dev/null ; then
+ MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which firefox) | cut -d '"' -f
2 | cut -d '=' -f 2 )
+elif [ $(which firefox 2>/dev/null) ] && grep MOZILLA_LIBDIR= "$(which
firefox)" > /dev/null ; then
+ MOZILLA_HOME=$(grep MOZILLA_LIBDIR= $(which firefox) | cut -d '"' -f 2
| cut -d '=' -f 2)
else
echo "Cannot find mozilla installation directory. Please set
MOZILLA_FIVE_HOME to your mozilla directory"
exit 1
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
