diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Extras/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 22 |
3 files changed, 26 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2007-10-29 Michael Hutchinson <mhutchinson@novell.com> + + * configure.in: + * Extras/Makefile.am: Add MonoDevelop.SourceEditor2 into the build. + 2007-10-29 Lluis Sanchez Gual <lluis@novell.com> * contrib/Mono.Cecil/Mono.Cecil.mdp, contrib/Firebird/Firebird.mdp, diff --git a/Extras/Makefile.am b/Extras/Makefile.am index 282d0dd14a..8df8c1f7f2 100644 --- a/Extras/Makefile.am +++ b/Extras/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = MonoDevelop.DesignerSupport Deployment MonoDevelop.SourceEditor MonoDevelop.Autotools MonoDevelop.Gettext CSharpBinding DebuggerAddIn ILAsmBinding JavaBinding BooBinding NemerleBinding NUnit MonoDeveloperExtensions VersionControl VBNetBinding prj2make-sharp-lib WelcomePage ChangeLogAddIn MonoDevelop.GtkCore AspNetAddIn AspNetEdit MonoDevelop.WebReferences MonoDevelop.RegexToolkit CBinding MonoDevelop.Database +SUBDIRS = MonoDevelop.DesignerSupport Deployment MonoDevelop.SourceEditor MonoDevelop.SourceEditor2 MonoDevelop.Autotools MonoDevelop.Gettext CSharpBinding DebuggerAddIn ILAsmBinding JavaBinding BooBinding NemerleBinding NUnit MonoDeveloperExtensions VersionControl VBNetBinding prj2make-sharp-lib WelcomePage ChangeLogAddIn MonoDevelop.GtkCore AspNetAddIn AspNetEdit MonoDevelop.WebReferences MonoDevelop.RegexToolkit CBinding MonoDevelop.Database diff --git a/configure.in b/configure.in index bfdf4bd4a5..2a92944608 100644 --- a/configure.in +++ b/configure.in @@ -75,6 +75,7 @@ fi dnl hard dependencies GTKSHARP_REQUIRED_VERSION=2.8.0 GTKSOURCEVIEWSHARP_REQUIRED_VERSION=0.10 +GTKSOURCEVIEW2SHARP_REQUIRED_VERSION=2.0 GECKOSHARP_REQUIRED_VERSION=0.10 MONODOC_REQUIRED_VERSION=1.0 @@ -92,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(GTKSOURCEVIEW_SHARP, gtksourceview-sharp-2.0 >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION) -AC_SUBST(GTKSOURCEVIEW_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) @@ -104,6 +103,22 @@ AC_SUBST(MONO_CAIRO_LIBS) gtksharp_prefix="`$PKG_CONFIG --variable=prefix gtk-sharp-2.0`" AC_SUBST(gtksharp_prefix) +## gtksourceview2-sharp +AC_ARG_ENABLE(gtksourceview2, + AC_HELP_STRING([--enable-gtksourceview2], + [use GtkSourceView 2 [default=no]]), + enable_gtksourceview2=${enableval}, enable_gtksourceview2=no) + +if test "x$enable_gtksourceview2" = "xyes"; then + PKG_CHECK_MODULES(GTKSOURCEVIEW2_SHARP, gtksourceview2-sharp >= $GTKSOURCEVIEW2SHARP_REQUIRED_VERSION) + AC_SUBST(GTKSOURCEVIEW2_SHARP_LIBS) +else + PKG_CHECK_MODULES(GTKSOURCEVIEW_SHARP, gtksourceview-sharp-2.0 >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION) + AC_SUBST(GTKSOURCEVIEW_SHARP_LIBS) +fi + +AM_CONDITIONAL(ENABLE_GTKSOURCEVIEW2, test x$enable_gtksourceview2 = xyes) + dnl deal with the mono debugger MONO_DEBUGGER_REQUIRED_VERSION=0.9 AC_ARG_ENABLE(debugger, @@ -430,6 +445,8 @@ Extras/DebuggerAddIn/Makefile Extras/DebuggerAddIn/DebuggerPaths.cs Extras/MonoDevelop.SourceEditor/AssemblyInfo.cs Extras/MonoDevelop.SourceEditor/Makefile +Extras/MonoDevelop.SourceEditor2/AssemblyInfo.cs +Extras/MonoDevelop.SourceEditor2/Makefile Extras/prj2make-sharp-lib/AssemblyInfo.cs Extras/prj2make-sharp-lib/Makefile Extras/WelcomePage/Makefile @@ -485,4 +502,5 @@ echo " * ASP.NET project support: $enable_aspnet" echo " * ASP.NET Visual Designer: $enable_aspnetedit" echo " * Web References: yes" echo " * C/C++ project support: $enable_c" +echo " * GtkSourceView2: $enable_gtksourceview2" echo "" |