2007-11-30 Michael Hutchinson <mhutchinson@novell.com>

	* configure.in:
	* Extras/Extras.mds:
	* Extras/Makefile.am: Enable the GeckoBrowserBinding.

	* Extras/GeckoWebBrowser: Add svn:ignores.


svn path=/trunk/monodevelop/; revision=90496

1 files changed, 28 insertions, 8 deletions

diff --git a/configure.in b/configure.in
index 11fde7b274..10b69f2681 100644
--- a/configure.in
+++ b/configure.in
@@ -93,8 +93,6 @@ PKG_CHECK_MODULES(GCONF_SHARP, gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
 AC_SUBST(GCONF_SHARP_LIBS)
 PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
 AC_SUBST(GTKHTML_SHARP_LIBS)
-PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION)
-AC_SUBST(GECKO_SHARP_LIBS)
 PKG_CHECK_MODULES(MONODOC, monodoc >= $MONODOC_REQUIRED_VERSION)
 AC_SUBST(MONODOC_LIBS)
 PKG_CHECK_MODULES(MONO_CAIRO, mono-cairo >= 1.2)
@@ -246,7 +244,22 @@ AC_ARG_ENABLE(aspnet,
 		[enable ASP.NET project support [default=yes]]),
 		enable_aspnet=${enableval}, enable_aspnet=yes)
 
-AM_CONDITIONAL(ENABLE_ASPNET, [test x$enable_aspnet = xyes]) 
+AM_CONDITIONAL(ENABLE_ASPNET, [test x$enable_aspnet = xyes])
+
+
+# Optional Mozilla dependency
+AC_ARG_ENABLE(geckosharp,
+	AC_HELP_STRING([--enable-geckosharp],
+		[enable GeckoSharp Mozilla support [default=yes]]),
+		enable_geckosharp=${enableval}, enable_geckosharp=yes)
+
+if test "x$enable_geckosharp" = "xyes"; then
+	PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION)
+	AC_SUBST(GECKO_SHARP_LIBS)
+fi
+
+AM_CONDITIONAL(ENABLE_GECKOSHARP, [test x$enable_geckosharp = xyes])
+
 
 #We need to know where Mozilla is for launch scripts and possible for AspNetEdit
 #Check pkg-config first
@@ -292,8 +305,9 @@ 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
-		AC_MSG_WARN([Cannot detect Mozilla library directory. WelcomePage addin may not be able to function.])
+	fi
+	if test "x$enable_geckosharp" = "xyes"; then
+		AC_MSG_WARN([Cannot detect Mozilla library directory. Some features may not be available.])
 	fi
 fi
 	
@@ -305,11 +319,15 @@ AC_ARG_ENABLE(aspnetedit,
 		[enable ASP.NET visual designer support [default=no]]),
 		enable_aspnetedit=yes, enable_aspnetedit=no)
 
-if test "x$enable_aspnet" = "xno"; then
-	enable_aspnetedit=no
-	if test "x$enable_aspnetedit" = "xyes"; then
+if test "x$enable_aspnetedit" = "xyes"; then
+	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_geckosharp" = "xno"; then
+		enable_aspnetedit=no
+		AC_MSG_WARN([Cannot enable AspNetEdit without GeckoSharp support.])
+	fi
 fi
 
 if test "x$enable_aspnetedit" = "xyes"; then
@@ -465,6 +483,7 @@ Extras/Deployment/MonoDevelop.Deployment.Linux/Makefile
 Extras/MonoDevelop.Gettext/Makefile
 Extras/MonoDevelop.RegexToolkit/Makefile
 Extras/CBinding/Makefile
+Extras/GeckoWebBrowser/Makefile
 Makefile
 monodevelop
 mdtool
@@ -502,4 +521,5 @@ echo "   * ASP.NET Visual Designer: $enable_aspnetedit"
 echo "   * Web References: yes"
 echo "   * C/C++ project support: $enable_c"
 echo "   * GtkSourceView2: $enable_gtksourceview2"
+echo "   * GeckoSharp:     $enable_geckosharp"
 echo ""