All pastes #1882255 Raw Edit

anjuta1

public text v1 · immutable
#1882255 ·published 2010-06-13 14:50 UTC
rendered paste body
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Sun, 25 Oct 2009 20:58:15 +0100
Subject: [PATCH] Allow disabling symbol-db plugin
From: Pacho Ramos <pacho@gentoo.org>
Date Sun, 13 Jun 2010 16:40:00 +0100
Subject: Port to 2.30
diff --git a/configure.in b/configure.in
index 197cafd..e7c5445 100644
--- a/configure.in
+++ b/configure.in
@@ -246,6 +246,29 @@
 
 AM_CONDITIONAL(HAVE_PLUGIN_GLADE, [test x$gladeui_found = xyes])
 
+dnl Plugin Symbol DB
+dnl -------------------------------------------------------------
+
+AC_ARG_ENABLE(plugin-symbol-db,
+       AC_HELP_STRING([--disable-plugin-symbol-db],[libgda-4 based symbol DB]),
+       [ if test "$enableval" = "yes"; then
+               user_disabled_symbol_db=1
+         fi ],
+       [ user_disabled_symbol_db=0 ])
+
+AC_MSG_CHECKING(if symbol db plugin is disabled)
+if test "$user_disabled_symbol_db" = 1; then
+       AC_MSG_RESULT(no)
+       symbol_db="yes"
+
+       PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
+                       [libgda-4.0 >= $GDA_REQUIRED])
+else
+       AC_MSG_RESULT(yes)
+       symbol_db="no"
+fi
+AM_CONDITIONAL(HAVE_PLUGIN_SYMBOL_DB, [test x$symbol_db = xyes])
+
 dnl Check for gtksourceview
 dnl -------------------------------------------------------------
@@ -255,8 +278,6 @@ fi
 
 AM_CONDITIONAL(HAVE_PLUGIN_SOURCEVIEW, [test x$sourceview = xyes])
 
-PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB,
-		[libgda-4.0 >= $GDA_REQUIRED])
 
 dnl Setup Anjuta Library flags
 dnl --------------------------
@@ -862,6 +883,13 @@ else
        echo "        Requires devhelp >= 0.22"
 fi
 
+if [ test x$symbol_db = xyes ]; then
+        echo "Building Symbol DB plugin: .............................YES"
+else
+        echo "Building Symbol DB plugin: .............................NO"
+	echo "		Requires libgda-4"
+fi
+
 if [ test x$sourceview = xyes ]; then
         echo "Building GtkSourceView based editor: ...................YES"
 else
diff --git a/plugins/symbol-db/Makefile.am b/plugins/symbol-db/Makefile.am
index 9b94b6d..07aad96 100644
--- a/plugins/symbol-db/Makefile.am
+++ b/plugins/symbol-db/Makefile.am
@@ -1,3 +1,5 @@
+if HAVE_PLUGIN_SYMBOL_DB
+
 SUBDIRS = . anjuta-tags images benchmark
 
 symbol_db_datadir = $(anjuta_data_dir)
@@ -82,6 +84,8 @@ libanjuta_symbol_db_la_LIBADD = \
 prefs_ui_files = anjuta-symbol-db.ui
 include $(top_srcdir)/scripts/build-schemas.mk
 
+endif
+
 EXTRA_DIST = \
 	$(plugin_in_files) \
 	$(symbol_db_plugin_DATA) \
-- 
1.6.5.rc1