[anjuta] sourceview: Don't allow to disable gtksourceview - it's the only editor



commit d89ec2589aad2c2b84610c4e25d6603751b00a8e
Author: Johannes Schmid <jhs gnome org>
Date:   Mon Jan 24 16:22:04 2011 +0100

    sourceview: Don't allow to disable gtksourceview - it's the only editor

 configure.ac                   |   26 +-------------------------
 plugins/sourceview/Makefile.am |    8 ++------
 2 files changed, 3 insertions(+), 31 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 88ce89f..bd5d05f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,26 +230,8 @@ AM_CONDITIONAL(HAVE_PLUGIN_GLADE, [test x$gladeui_found = xyes])
 
 dnl Check for gtksourceview
 dnl -------------------------------------------------------------
-
-AC_ARG_ENABLE(plugin-sourceview,
-	AS_HELP_STRING([--disable-plugin-sourceview],[Disable gtksourceview based editor in Anjuta]),
-	[ if test "$enableval" = "no"; then
-		user_disabled_sourceview=1
-	  fi ],
-	[ user_disabled_sourceview=0 ])
-
-AC_MSG_CHECKING(if sourceview plugin is disabled)
-if test "$user_disabled_sourceview" = 1; then
-	AC_MSG_RESULT(yes)
-	sourceview="no"
-else
-	AC_MSG_RESULT(no)
-	sourceview="yes"
-	PKG_CHECK_MODULES(PLUGIN_SOURCEVIEW,
+PKG_CHECK_MODULES(SOURCEVIEW,
 		[gtksourceview-3.0 >= $GTKSOURCEVIEW_REQUIRED])
-fi
-
-AM_CONDITIONAL(HAVE_PLUGIN_SOURCEVIEW, [test x$sourceview = xyes])
 
 dnl Check for vala
 dnl -------------------------------------------------------------
@@ -968,12 +950,6 @@ else
        echo "Building devhelp plugin: ...............................NO"
        echo "        Requires libdevhelp-3.0 (>= $LIBDEVHELP_REQUIRED)"
 fi
-
-if [ test x$sourceview = xyes ]; then
-        echo "Building GtkSourceView based editor: ...................YES"
-else
-        echo "Building GtkSourceView based editor: ...................NO"
-fi
 if [ test x$enable_vala = xyes ]; then
         echo "Building Vala support: .................................YES"
 else
diff --git a/plugins/sourceview/Makefile.am b/plugins/sourceview/Makefile.am
index 5cfc1a9..acc4631 100644
--- a/plugins/sourceview/Makefile.am
+++ b/plugins/sourceview/Makefile.am
@@ -1,5 +1,3 @@
-if HAVE_PLUGIN_SOURCEVIEW
-
 # Plugin glade file
 sourceview_xmldir = $(anjuta_glade_dir)
 sourceview_xml_DATA = anjuta-editor-sourceview.ui
@@ -26,7 +24,7 @@ AM_CPPFLAGS = \
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(GIO_CFLAGS) \
-	$(PLUGIN_SOURCEVIEW_CFLAGS) \
+	$(SOURCEVIEW_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DG_LOG_DOMAIN=\"sourceview\"
 
@@ -76,7 +74,7 @@ libanjuta_sourceview_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 # Plugin dependencies
 libanjuta_sourceview_la_LIBADD = \
 	$(GIO_LIBS) \
-	$(PLUGIN_SOURCEVIEW_LIBS) \
+	$(SOURCEVIEW_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 prefs_name = org.gnome.anjuta.sourceview
@@ -84,8 +82,6 @@ prefs_keyfile = sourceview.gschema-part.xml
 prefs_ui_files = anjuta-editor-sourceview.ui
 include $(top_srcdir)/scripts/build-schemas.mk
 
-endif
-
 EXTRA_DIST = \
 	anjuta-marshal.list \
 	$(plugin_in_files) \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]