Author: mhutch
Date: 2007-05-13 11:23:01 -0400 (Sun, 13 May 2007)
New Revision: 77319
Modified:
trunk/monodevelop/ChangeLog
trunk/monodevelop/configure.in
Log:
2007-05-13 Michael Hutchinson <[EMAIL PROTECTED]>
* configure.in: Remove JSCall# dependency for AspNetEdit.
Modified: trunk/monodevelop/ChangeLog
===================================================================
--- trunk/monodevelop/ChangeLog 2007-05-13 15:22:00 UTC (rev 77318)
+++ trunk/monodevelop/ChangeLog 2007-05-13 15:23:01 UTC (rev 77319)
@@ -1,3 +1,7 @@
+2007-05-13 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * configure.in: Remove JSCall# dependency for AspNetEdit.
+
2007-05-10 Jeffrey Stedfast <[EMAIL PROTECTED]>
* README: Updated to reflect new gtk-sharp dependency
Modified: trunk/monodevelop/configure.in
===================================================================
--- trunk/monodevelop/configure.in 2007-05-13 15:22:00 UTC (rev 77318)
+++ trunk/monodevelop/configure.in 2007-05-13 15:23:01 UTC (rev 77319)
@@ -193,8 +193,42 @@
AM_CONDITIONAL(ENABLE_ASPNET, test x$enable_aspnet = xyes)
-dnl ASP.NET visual designer addin
-JSCALL_REQUIRED_VERSION=0.0.2
+
+#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 -n "$MOZILLA_HOME"); then
+ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir firefox-gtkmozembed`"
+fi
+if !(test -n "$MOZILLA_HOME"); then
+ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir xulrunner-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
+ if test "x$enable_aspnetedit" = "xyes"; then
+ AC_MSG_ERROR([Cannot detect Mozilla library directory.
AspNetEdit addin cannot be built.])
+ else
+ AC_MSG_WARN([Cannot detect Mozilla library directory.
WelcomePage addin may not be able to function.])
+ fi
+ fi
+fi
+
+AC_SUBST(MOZILLA_HOME)
+
+# ASP.NET visual designer addin
AC_ARG_ENABLE(aspnetedit,
AC_HELP_STRING([--enable-aspnetedit],
[enable ASP.NET visual designer support [default=no]]),
@@ -202,24 +236,10 @@
if test "x$enable_aspnet" = "xno"; then
enable_aspnetedit=no
+ AC_MSG_WARN([Cannot enable AspNetEdit without ASP.NET project support.])
fi
if test "x$enable_aspnetedit" = "xyes"; then
- PKG_CHECK_MODULES(JSCALL, jscall-sharp >= $JSCALL_REQUIRED_VERSION)
-
- ### Get javascript file supplied by JSCall
- JSCALL_SCRIPT="`$PKG_CONFIG --variable=Script jscall-sharp`"
- AC_SUBST(JSCALL_SCRIPT)
-
- ### find assembly paths for unstable installed assemblies that will be
- ### copied into the installation directory for local usage with the app
- UNSTABLE_INSTALL_ASSEMBLIES="jscall-sharp"
- INSTALLED_ASSEMBLIES="`$PKG_CONFIG --variable=Libraries
$UNSTABLE_INSTALL_ASSEMBLIES`"
- AC_SUBST(INSTALLED_ASSEMBLIES)
-
- ### Find the Mozilla directory from JSCall -- we must use the same
version
- ### against which it was linked.
- MOZILLA_HOME="`$PKG_CONFIG --variable=MozillaHome jscall-sharp`"
### Find out how we need to install the chrome -- the installation
mechanism
### changed from FF 1.0 to FF 1.5
@@ -232,7 +252,6 @@
AC_MSG_RESULT([manifest file])
fi
- AC_SUBST(MOZILLA_HOME)
AC_SUBST(MOZILLA_EXTENSION_TYPE)
# get zip to create jar/xpi for chrome
@@ -240,33 +259,6 @@
if test "x$ZIP" = "x" ; then
AC_MSG_ERROR([Can't find "zip" in your PATH])
fi
-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
AM_CONDITIONAL(MOZILLA_EXTENSION_TYPE_TEXTFILE, test -f
"$MOZILLA_HOME/chrome/installed-chrome.txt")
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches