diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 14 | ||||
| -rwxr-xr-x | monodevelop.in | 14 |
3 files changed, 18 insertions, 14 deletions
@@ -1,3 +1,7 @@ +2007-09-20 Michael Hutchinson <mhutchinson@novell.com> + + * configure.in, monodevelop.in: Fix Mozilla detection script. + 2007-09-20 Ben Motmans <ben.motmans@gmail.com> * configure.in: detection of database providers diff --git a/configure.in b/configure.in index ae55061577..edd5161901 100644 --- a/configure.in +++ b/configure.in @@ -257,21 +257,20 @@ find_libgtkembedmoz () MOZDIR=$MOZILLA_FIVE_HOME if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi - MOZDIR=$(grep -h GRE_PATH= /etc/gre.d/*.conf | cut -d '"' -f 2 -d = | head -n 1) #" + MOZDIR=$(grep -h GRE_PATH= /etc/gre.d/*.conf 2>/dev/null | cut -d '"' -f 2 -d = | head -n 1) #" if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi mozilla_script=$(which mozilla 2> /dev/null) firefox_script=$(which firefox 2> /dev/null) - for runtime in "$mozilla_script $firefox_script"; do - if test ! -e "$runtime_script"; then continue; fi - MOZDIR=$(grep "MOZ_DIST_LIB=" $runtime_script | cut -d '"' -f 2 | cut -d '=' -f 2) + for runtime_script in "$firefox_script $mozilla_script"; do + MOZDIR=$(grep "MOZ_DIST_LIB=" $runtime_script 2> /dev/null | cut -d '"' -f 2 | cut -d '=' -f 2) if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi - MOZDIR=$(grep "MOZILLA_FIVE_HOME=" $runtime_script | cut -d '"' -f 2 | cut -d '=' -f 2) + MOZDIR=$(grep "MOZILLA_FIVE_HOME=" $runtime_script 2> /dev/null | cut -d '"' -f 2 | cut -d '=' -f 2) if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi - MOZDIR=$(grep "MOZILLA_LIBDIR=" $runtime_script | cut -d '"' -f 2 | cut -d '=' -f 2) + MOZDIR=$(grep "MOZILLA_LIBDIR=" $runtime_script 2> /dev/null | cut -d '"' -f 2 | cut -d '=' -f 2) if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi - MOZDIR=$(grep "moz_libdir=" $runtime_script | cut -d '"' -f 2 | cut -d '=' -f 2) + MOZDIR=$(grep "moz_libdir=" $runtime_script 2> /dev/null | cut -d '"' -f 2 | cut -d '=' -f 2) if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi done } @@ -279,6 +278,7 @@ find_libgtkembedmoz () MOZILLA_HOME=`find_libgtkembedmoz` if test -z "$MOZILLA_HOME"; then + MOZILLA_HOME= if test "x$enable_aspnetedit" = "xyes"; then AC_MSG_ERROR([Cannot detect Mozilla library directory. AspNetEdit addin cannot be built.]) else diff --git a/monodevelop.in b/monodevelop.in index 58f4916f3c..a2b22b98f6 100755 --- a/monodevelop.in +++ b/monodevelop.in @@ -24,21 +24,20 @@ find_libgtkembedmoz () MOZDIR=$MOZILLA_FIVE_HOME if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi - MOZDIR=$(grep -h GRE_PATH= /etc/gre.d/*.conf | cut -d '"' -f 2 -d = | head -n 1) #" + MOZDIR=$(grep -h GRE_PATH= /etc/gre.d/*.conf 2>/dev/null | cut -d '"' -f 2 -d = | head -n 1) #" if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi mozilla_script=$(which mozilla 2> /dev/null) firefox_script=$(which firefox 2> /dev/null) - for runtime in "$mozilla_script $firefox_script"; do - if test ! -e "$runtime_script"; then continue; fi - MOZDIR=$(grep "MOZ_DIST_LIB=" $runtime_script | cut -d '"' -f 2 | cut -d '=' -f 2) + for runtime_script in "$firefox_script $mozilla_script"; do + MOZDIR=$(grep "MOZ_DIST_LIB=" $runtime_script 2> /dev/null | cut -d '"' -f 2 | cut -d '=' -f 2) if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi - MOZDIR=$(grep "MOZILLA_FIVE_HOME=" $runtime_script | cut -d '"' -f 2 | cut -d '=' -f 2) + MOZDIR=$(grep "MOZILLA_FIVE_HOME=" $runtime_script 2> /dev/null | cut -d '"' -f 2 | cut -d '=' -f 2) if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi - MOZDIR=$(grep "MOZILLA_LIBDIR=" $runtime_script | cut -d '"' -f 2 | cut -d '=' -f 2) + MOZDIR=$(grep "MOZILLA_LIBDIR=" $runtime_script 2> /dev/null | cut -d '"' -f 2 | cut -d '=' -f 2) if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi - MOZDIR=$(grep "moz_libdir=" $runtime_script | cut -d '"' -f 2 | cut -d '=' -f 2) + MOZDIR=$(grep "moz_libdir=" $runtime_script 2> /dev/null | cut -d '"' -f 2 | cut -d '=' -f 2) if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi done } @@ -48,6 +47,7 @@ if test -e "@MOZILLA_HOME@/$MOZFILE"; then else MOZILLA_HOME=`find_libgtkembedmoz` if test ! -e "$MOZILLA_HOME/$MOZFILE"; then + MOZILLA_HOME= echo "WARNING: Cannot find Mozilla directory containing $MOZFILE. Some Addins may not be able to function. Please set MOZILLA_FIVE_HOME to your Mozilla directory." fi fi |