[anjuta] terminal: bgo #699316 - Add option to disable terminal plugin



commit 745cc61a64d3a183ef5f0f091db2a076a213be56
Author: Arnel A. Borja <kyoushuu yahoo com>
Date:   Sun Apr 28 12:39:36 2013 +0800

    terminal: bgo #699316 - Add option to disable terminal plugin
    
    Since Anjuta could work without the terminal plugin, add an option to
    disable it.

 configure.ac                 |   41 +++++++++++++++++++++++++++++++++++++----
 plugins/terminal/Makefile.am |   41 ++++++++++++++++++++++-------------------
 2 files changed, 59 insertions(+), 23 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7a10eb2..468cd44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,6 @@ GTHREAD_REQUIRED=2.22.0
 GDK_PIXBUF_REQUIRED=2.0.0
 GDA4_REQUIRED=4.2.0
 GDA5_REQUIRED=5.0.0
-VTE_REQUIRED=0.27.6
 LIBXML_REQUIRED=2.4.23
 GDL_REQUIRED=3.5.5
 LIBWNCK_REQUIRED=2.12
@@ -45,6 +44,9 @@ LIBWNCK_REQUIRED=2.12
 dnl GtkSourceView
 GTKSOURCEVIEW_REQUIRED=3.0.0
 
+dnl Terminal
+VTE_REQUIRED=0.27.6
+
 dnl Devhelp
 LIBDEVHELP_REQUIRED=3.7.4
 
@@ -161,9 +163,6 @@ PKG_CHECK_MODULES([GDA],
    [libgda-5.0 >= $GDA5_REQUIRED],,
    [PKG_CHECK_MODULES([GDA],
       [libgda-4.0 >= $GDA4_REQUIRED])])
-       
-PKG_CHECK_MODULES([VTE],
-   [vte-2.90 >= $VTE_REQUIRED])
 
 dnl Check for autogen
 dnl -----------------
@@ -173,6 +172,32 @@ if test x$AUTOGEN_PATH = xno; then
                 but several things won't work. You can get it from http://autogen.sourceforge.net/])
 fi
 
+dnl Check for Terminal
+dnl ---------------------
+
+AC_ARG_ENABLE(plugin-terminal,
+  AS_HELP_STRING([--disable-plugin-terminal],[Disable terminal plugin support in Anjuta.]),
+  [ if test "$enableval" = "no"; then
+       user_disabled_terminal=1
+    fi ],
+  [ user_disabled_terminal=0 ] )
+
+AC_MSG_CHECKING(if terminal plugin is disabled)
+if test "$user_disabled_terminal" = 1; then
+       AC_MSG_RESULT(yes)
+       terminal_enabled="no"
+else
+       AC_MSG_RESULT(no)
+       PKG_CHECK_MODULES(PLUGIN_TERMINAL, [vte-2.90 >= $VTE_REQUIRED],
+           [
+               terminal_enabled=yes
+           ], [
+               terminal_enabled=no
+           ])
+fi
+
+AM_CONDITIONAL(HAVE_PLUGIN_TERMINAL, [test x$terminal_enabled = xyes])
+
 dnl Check for Devhelp
 dnl -----------------
 
@@ -915,6 +940,14 @@ else
        echo "Building devhelp plugin: ...............................NO"
        echo "        Requires libdevhelp-3.0 (>= $LIBDEVHELP_REQUIRED)"
 fi
+
+if [ test x$terminal_enabled = xyes ]; then
+       echo "Building terminal plugin: ..............................YES"
+else
+       echo "Building terminal plugin: ..............................NO"
+       echo "        Requires vte-2.90 (>= $VTE_REQUIRED)"
+fi
+
 if [ test x$enable_vala = xyes ]; then
         echo "Building Vala support: .................................YES"
 else
diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am
index d4ab110..ba8579a 100644
--- a/plugins/terminal/Makefile.am
+++ b/plugins/terminal/Makefile.am
@@ -1,3 +1,19 @@
+# Plugin description file
+plugin_in_files = anjuta-terminal.plugin.in
+%.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+gsettings_in_file = org.gnome.anjuta.terminal.gschema.xml.in
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
+
+# Include paths
+AM_CPPFLAGS = \
+       $(WARN_CFLAGS) \
+       $(DEPRECATED_FLAGS) \
+       $(PLUGIN_TERMINAL_CFLAGS) \
+       $(LIBANJUTA_CFLAGS)
+
+if HAVE_PLUGIN_TERMINAL
 # Plugin glade file
 terminal_gladedir = $(anjuta_glade_dir)
 dist_terminal_glade_DATA = anjuta-terminal-plugin.ui
@@ -12,20 +28,6 @@ dist_terminal_pixmaps_DATA = \
        anjuta-terminal-plugin.svg \
        anjuta-terminal-plugin-48.png
 
-# Plugin description file
-plugin_in_files = anjuta-terminal.plugin.in
-%.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-terminal_plugindir = $(anjuta_plugin_dir)
-dist_terminal_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
-
-# Include paths
-AM_CPPFLAGS = \
-       $(WARN_CFLAGS) \
-       $(DEPRECATED_FLAGS) \
-       $(VTE_CFLAGS) \
-       $(LIBANJUTA_CFLAGS)
-
 # Where to install the plugin
 plugindir = $(anjuta_plugin_dir)
 
@@ -39,13 +41,14 @@ libanjuta_terminal_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
 
 # Plugin dependencies
 libanjuta_terminal_la_LIBADD = \
-       $(VTE_LIBS) \
+       $(PLUGIN_TERMINAL_LIBS) \
        $(LIBANJUTA_LIBS)
-       
-gsettings_in_file = org.gnome.anjuta.terminal.gschema.xml.in
+
+terminal_plugindir = $(anjuta_plugin_dir)
+dist_terminal_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+
 gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
- INTLTOOL_XML_NOMERGE_RULE@
- GSETTINGS_RULES@
+endif
 
 EXTRA_DIST = \
        $(plugin_in_files) \


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