[gnome-builder] devhelp: if we don't find devhelp disable the plugin



commit 8462aa5d1e297fec7ecd18e9d6464920f0631224
Author: Christian Hergert <christian hergert me>
Date:   Tue Sep 1 00:48:05 2015 -0700

    devhelp: if we don't find devhelp disable the plugin

 configure.ac                |    5 +++++
 plugins/devhelp/Makefile.am |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index dd938f8..82db6e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,9 @@ PKG_CHECK_MODULES(VTE,      [vte-2.91 >= vte_required_version],
 PKG_CHECK_MODULES(TERMINAL, [vte-2.91 >= vte_required_version],
                             [enable_terminal_plugin=yes],
                             [enable_terminal_plugin=no])
+PKG_CHECK_MODULES(DEVHELP,  [libdevhelp-3.0 >= devhelp_required_version],
+                            [enable_devhelp_plugin=yes],
+                            [enable_devhelp_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])
@@ -290,6 +293,7 @@ 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)
+AM_CONDITIONAL(ENABLE_DEVHELP_PLUGIN, test x$enable_devhelp_plugin != xno)
 
 
 dnl ***********************************************************************
@@ -546,6 +550,7 @@ echo "  Autotools ............................ : yes"
 echo "  C Language Pack ...................... : yes"
 echo "  Command Bar .......................... : yes"
 echo "  Ctags ................................ : yes"
+echo "  Devhelp .............................. : ${enable_devhelp_plugin}"
 echo "  Device Manager ....................... : yes"
 echo "  GNOME Code Assistance ................ : yes"
 echo "  Global File Search ................... : yes"
diff --git a/plugins/devhelp/Makefile.am b/plugins/devhelp/Makefile.am
index 4e7157a..f7fb6ad 100644
--- a/plugins/devhelp/Makefile.am
+++ b/plugins/devhelp/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_DEVHELP_PLUGIN
+
 DISTCLEANFILES =
 BUILT_SOURCES =
 CLEANFILES =
@@ -53,4 +55,7 @@ glib_resources_xml = gb-devhelp.gresource.xml
 glib_resources_namespace = gb_devhelp
 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]