[gnome-builder] terminal: make terminal plugin optional
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] terminal: make terminal plugin optional
- Date: Tue, 1 Sep 2015 08:26:50 +0000 (UTC)
commit 992fbe3ebd833107cdae4fc7cb50655b7f5cd4d6
Author: Christian Hergert <christian hergert me>
Date: Tue Sep 1 00:47:33 2015 -0700
terminal: make terminal plugin optional
If we don’t find VTE, just disable the terminal plugin.
configure.ac | 6 ++++++
plugins/terminal/Makefile.am | 4 ++++
2 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 43f056e..dd938f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,6 +169,9 @@ PKG_CHECK_MODULES(BUILDER, [gtk+-3.0 >= gtk_required_version
PKG_CHECK_MODULES(VTE, [vte-2.91 >= vte_required_version],
[have_vte=yes],
[have_vte=no])
+PKG_CHECK_MODULES(TERMINAL, [vte-2.91 >= vte_required_version],
+ [enable_terminal_plugin=yes],
+ [enable_terminal_plugin=no])
PKG_CHECK_MODULES(EGG, [glib-2.0 >= glib_required_version
gtk+-3.0 >= gtk_required_version])
PKG_CHECK_MODULES(GD, [gtk+-3.0 >= gtk_required_version])
@@ -286,6 +289,8 @@ dnl ***********************************************************************
AM_CONDITIONAL(ENABLE_PYTHON_SCRIPTING, test x$enable_python_scripting != xno)
AM_CONDITIONAL(ENABLE_GJS_SCRIPTING, test x$enable_gjs_scripting != xno)
+AM_CONDITIONAL(ENABLE_TERMINAL_PLUGIN, test x$enable_terminal_plugin != xno)
+
dnl ***********************************************************************
dnl Initialize Libtool
@@ -551,5 +556,6 @@ echo " Python Jedi Autocompletion ........... : yes"
echo " Python Language Pack ................. : yes"
echo " Symbol Monitor ....................... : yes"
echo " Symbol Tree .......................... : yes"
+echo " Terminal ............................. : ${enable_terminal_plugin}"
echo " XML Language Pack .................... : yes"
echo ""
diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am
index 2039cc9..197be1e 100644
--- a/plugins/terminal/Makefile.am
+++ b/plugins/terminal/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_TERMINAL_PLUGIN
+
DISTCLEANFILES =
BUILT_SOURCES =
CLEANFILES =
@@ -56,5 +58,7 @@ glib_resources_xml = gb-terminal.gresource.xml
glib_resources_namespace = gb_terminal
include $(top_srcdir)/build/autotools/Makefile.am.gresources
+endif
+
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]