[gnome-builder] build: move plugin configuration into plugins/<plugin>/configure.ac

From: Christian Hergert <chergert src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-builder] build: move plugin configuration into plugins/<plugin>/configure.ac
Date: Wed, 9 Sep 2015 01:24:05 +0000 (UTC)
commit fa6465d94ae9da3f600e0b62e081f73c4c301074
Author: Christian Hergert <christian hergert me>
Date:   Tue Sep 8 18:20:43 2015 -0700

    build: move plugin configuration into plugins/<plugin>/configure.ac
    
    This allows us to keep most of the plugin information componentized to
    the plugin, with the exception of the m4_include() and summary output.

 build/autotools/gb_enable_lto.m4                  |   78 ----------
 configure.ac                                      |  156 ++++++---------------
 plugins/autotools/Makefile.am                     |    8 +-
 plugins/autotools/configure.ac                    |   12 ++
 plugins/c-pack/Makefile.am                        |    8 +-
 plugins/c-pack/configure.ac                       |   12 ++
 plugins/clang/configure.ac                        |   38 +++++
 plugins/command-bar/Makefile.am                   |    8 +-
 plugins/command-bar/configure.ac                  |   12 ++
 plugins/ctags/Makefile.am                         |    8 +-
 plugins/ctags/configure.ac                        |   14 ++
 plugins/devhelp/Makefile.am                       |    5 +-
 plugins/devhelp/configure.ac                      |    3 +
 plugins/device-manager/Makefile.am                |    7 +-
 plugins/device-manager/configure.ac               |   12 ++
 plugins/file-search/configure.ac                  |   12 ++
 plugins/gnome-code-assistance/Makefile.am         |    8 +-
 plugins/gnome-code-assistance/configure.ac        |   12 ++
 plugins/html-completion/Makefile.am               |    8 +-
 plugins/html-completion/configure.ac              |   12 ++
 plugins/html-preview/configure.ac                 |   20 +++
 plugins/jedi/Makefile.am                          |    4 +
 plugins/jedi/configure.ac                         |   12 ++
 plugins/mingw/Makefile.am                         |    8 +-
 plugins/mingw/configure.ac                        |   12 ++
 plugins/python-gi-imports-completion/Makefile.am  |    4 +
 plugins/python-gi-imports-completion/configure.ac |   12 ++
 plugins/python-pack/Makefile.am                   |    8 +-
 plugins/python-pack/configure.ac                  |   12 ++
 plugins/symbol-tree/Makefile.am                   |    7 +-
 plugins/symbol-tree/configure.ac                  |   12 ++
 plugins/sysmon/Makefile.am                        |    7 +-
 plugins/sysmon/configure.ac                       |   12 ++
 plugins/terminal/Makefile.am                      |    9 +-
 plugins/terminal/configure.ac                     |   20 +++
 plugins/xml-pack/Makefile.am                      |    8 +-
 plugins/xml-pack/configure.ac                     |   12 ++
 src/Makefile.am                                   |    7 +-
 38 files changed, 396 insertions(+), 223 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 13af562..e58a998 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,11 +97,6 @@ dnl ***********************************************************************
 AC_CHECK_PROG([GMAKE], [gmake], [gmake], [make])
 AC_DEFINE_UNQUOTED([GNU_MAKE_NAME], ["$GMAKE"], [Name of GNU make on this system])
 
-dnl ***********************************************************************
-dnl Find Path of Exuberant Ctags
-dnl ***********************************************************************
-AC_CHECK_PROGS([ECTAGS], [ctags-exuberant exctags ectags], [ctags])
-
 
 dnl ***********************************************************************
 dnl Enable high-performance counters
@@ -154,29 +149,23 @@ m4_define([gtksourceview_required_version], [3.17.3])
 m4_define([ggit_required_version], [0.23.5])
 m4_define([gjs_required_version], [1.42.0])
 m4_define([pygobject_required_version], [3.0.0])
-m4_define([devhelp_required_version], [3.16.0])
 m4_define([libxml_required_version], [2.9.0])
 m4_define([peas_required_version], [1.14.1])
-m4_define([vte_required_version], [0.40.2])
-m4_define([webkit_required_version], [2.8.5])
 
 PKG_CHECK_MODULES(BUILDER,  [gtk+-3.0 >= gtk_required_version
                              gio-2.0 >= glib_required_version
                              gtksourceview-3.0 >= gtksourceview_required_version
                              libgit2-glib-1.0 >= ggit_required_version
                              libpeas-1.0 >= peas_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(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])
+PKG_CHECK_MODULES(GEDIT,    [glib-2.0 >= glib_required_version
+                             gtk+-3.0 >= gtk_required_version])
+PKG_CHECK_MODULES(GJS,      [gjs-1.0 >= gjs_required_version
+                             gjs-internals-1.0 >= gjs_required_version],
+                            [enable_gjs_scripting=yes],
+                            [enable_gjs_scripting=no])
 PKG_CHECK_MODULES(ICONS,    [gio-2.0 >= glib_required_version])
 PKG_CHECK_MODULES(LIBGITG,  [libgit2-glib-1.0 >= ggit_required_version])
 PKG_CHECK_MODULES(LIBIDE,   [gio-2.0 >= glib_required_version
@@ -185,31 +174,21 @@ PKG_CHECK_MODULES(LIBIDE,   [gio-2.0 >= glib_required_version
                              libgit2-glib-1.0 >= ggit_required_version
                              libpeas-1.0 >= peas_required_version
                              libxml-2.0 >= libxml_required_version])
-PKG_CHECK_MODULES(RG,       [gtk+-3.0 >= gtk_required_version])
-PKG_CHECK_MODULES(SEARCH,   [glib-2.0 >= glib_required_version])
-PKG_CHECK_MODULES(GEDIT,    [glib-2.0 >= glib_required_version
-                             gtk+-3.0 >= gtk_required_version])
 PKG_CHECK_MODULES(NAUTILUS, [glib-2.0 >= glib_required_version
                              gtk+-3.0 >= gtk_required_version])
-PKG_CHECK_MODULES(XML,      [gio-2.0 >= glib_required_version
-                             libxml-2.0 >= libxml_required_version])
 PKG_CHECK_MODULES(PYGOBJECT,[pygobject-3.0 >= pygobject_required_version],
                             [have_pygobject=yes],
                             [have_pygobject=no])
-PKG_CHECK_MODULES(GJS,      [gjs-1.0 >= gjs_required_version
-                             gjs-internals-1.0 >= gjs_required_version],
-                            [enable_gjs_scripting=yes],
-                            [enable_gjs_scripting=no])
-
-PKG_CHECK_MODULES(HTML_PREVIEW_PLUGIN, [webkit2gtk-4.0 >= webkit_required_version],
-                                       [enable_html_preview_plugin=yes],
-                                       [enable_html_preview_plugin=no])
-
+PKG_CHECK_MODULES(RG,       [gtk+-3.0 >= gtk_required_version])
+PKG_CHECK_MODULES(SEARCH,   [glib-2.0 >= glib_required_version])
+PKG_CHECK_MODULES(XML,      [gio-2.0 >= glib_required_version
+                             libxml-2.0 >= libxml_required_version])
 
 
 dnl ***********************************************************************
 dnl Be extra careful about libgit2-glib requirements
 dnl ***********************************************************************
+# FIXME: Move git to a plugin. Requires abstraction in new-project-dialog.
 cflags_save="${CFLAGS}"
 libs_save="${LIBS}"
 CFLAGS="${CFLAGS} ${LIBGITG_CFLAGS}"
@@ -240,34 +219,28 @@ CFLAGS="${cflags_save}"
 LIBS="${libs_save}"
 
 
-
-dnl ***********************************************************************
-dnl Check for Clang, Required for C/C++ Diagnostics
-dnl ***********************************************************************
-enable_clang_plugin=no
-AC_CHECK_PROGS([LLVM_CONFIG], [llvm-config-3.5 llvm-config35 llvm-config], [])
-AS_IF([test "x$LLVM_CONFIG" = "x"],[],[
-       CLANG_INCLUDEDIR=`$LLVM_CONFIG --includedir`
-       CLANG_CFLAGS="-I$CLANG_INCLUDEDIR"
-       CLANG_LDFLAGS=`$LLVM_CONFIG --ldflags`
-       AC_SUBST([CLANG_INCLUDEDIR])
-       AC_SUBST([CLANG_CFLAGS])
-       AC_SUBST([CLANG_LDFLAGS])
-       CPPFLAGS_SAVE=${CPPFLAGS}
-       CPPFLAGS=-I${CLANG_INCLUDEDIR}
-       AC_CHECK_HEADER([clang-c/Index.h], [enable_clang_plugin=yes], [
-           AC_MSG_RESULT([Failed to locage clang-c/Index.h. Please install clang-devel.])
-       ])
-       CPPFLAGS=${CPPFLAGS_SAVE}
-])
-
-
 dnl ***********************************************************************
-dnl Additional VTE support in Builder core
+dnl Check for supported plugins
 dnl ***********************************************************************
-# FIXME: If we make adding menu items accessable from plugins, then
-#        we don't need this hack.
-AM_CONDITIONAL(HAVE_VTE, test x$have_vte != xno)
+m4_include([plugins/autotools/configure.ac])
+m4_include([plugins/c-pack/configure.ac])
+m4_include([plugins/clang/configure.ac])
+m4_include([plugins/command-bar/configure.ac])
+m4_include([plugins/ctags/configure.ac])
+m4_include([plugins/devhelp/configure.ac])
+m4_include([plugins/device-manager/configure.ac])
+m4_include([plugins/file-search/configure.ac])
+m4_include([plugins/gnome-code-assistance/configure.ac])
+m4_include([plugins/html-completion/configure.ac])
+m4_include([plugins/html-preview/configure.ac])
+m4_include([plugins/jedi/configure.ac])
+m4_include([plugins/mingw/configure.ac])
+m4_include([plugins/python-gi-imports-completion/configure.ac])
+m4_include([plugins/python-pack/configure.ac])
+m4_include([plugins/symbol-tree/configure.ac])
+m4_include([plugins/sysmon/configure.ac])
+m4_include([plugins/terminal/configure.ac])
+m4_include([plugins/xml-pack/configure.ac])
 
 
 dnl ***********************************************************************
@@ -293,11 +266,6 @@ 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)
-AM_CONDITIONAL(ENABLE_DEVHELP_PLUGIN, test x$enable_devhelp_plugin != xno)
-AM_CONDITIONAL(ENABLE_HTML_PREVIEW_PLUGIN, test x$enable_html_preview_plugin != xno)
-AM_CONDITIONAL(ENABLE_CLANG_PLUGIN, test x$enable_clang_plugin != xno)
-
 
 dnl ***********************************************************************
 dnl Initialize Libtool
@@ -401,11 +369,6 @@ AC_ARG_ENABLE(optimizations,
                     [enable_optimizations="no"],
                     [enable_optimizations="yes"])])
 AC_MSG_RESULT([$enable_optimizations])
-AC_ARG_ENABLE(lto,
-              AC_HELP_STRING([--enable-lto],
-                             [turn on link time optimizations [default=no]]),
-              [enable_lto=$enableval],
-              [enable_lto=no])
 OPTIMIZE_CFLAGS=""
 OPTIMIZE_LDFLAGS=""
 # Enable -Bsymbolic
@@ -414,13 +377,6 @@ AS_IF([test "$enable_optimizations" != "no"],
                           [OPTIMIZE_LDFLAGS="$OPTIMIZE_LDFLAGS -Wl,-Bsymbolic"])
        AX_CHECK_LINK_FLAG([-fno-plt],
                           [OPTIMIZE_LDFLAGS="$OPTIMIZE_LDFLAGS -fno-plt"])])
-
-
-# Enable Link-Time-Optimization
-GB_ENABLE_LTO
-OPTIMIZE_CFLAGS="$OPTIMIZE_CFLAGS $LTO_CFLAGS"
-
-
 AC_SUBST(OPTIMIZE_CFLAGS)
 AC_SUBST(OPTIMIZE_LDFLAGS)
 
@@ -476,26 +432,7 @@ AC_CONFIG_FILES([
        libide/Makefile
 
        plugins/Makefile
-       plugins/autotools/Makefile
-       plugins/clang/Makefile
-       plugins/command-bar/Makefile
-       plugins/c-pack/Makefile
-       plugins/ctags/Makefile
-       plugins/devhelp/Makefile
-       plugins/device-manager/Makefile
        plugins/fallback/Makefile
-       plugins/file-search/Makefile
-       plugins/gnome-code-assistance/Makefile
-       plugins/html-completion/Makefile
-       plugins/html-preview/Makefile
-       plugins/jedi/Makefile
-        plugins/python-gi-imports-completion/Makefile
-       plugins/mingw/Makefile
-       plugins/python-pack/Makefile
-       plugins/symbol-tree/Makefile
-       plugins/sysmon/Makefile
-       plugins/terminal/Makefile
-       plugins/xml-pack/Makefile
 
        data/Makefile
        data/gsettings/org.gnome.builder.code-insight.gschema.xml
@@ -531,7 +468,6 @@ echo ""
 echo "  Prefix ............................... : ${prefix}"
 echo "  Libdir ............................... : ${libdir}"
 echo "  Optimized Build ...................... : ${enable_optimizations}"
-echo "  Link-Time-Optimization (experimental). : ${enable_lto}"
 echo "  rdtscp ............................... : ${enable_rdtscp}"
 echo ""
 echo " Development Options"
@@ -550,23 +486,23 @@ echo "  GJS .................................. : ${enable_gjs_scripting}"
 echo ""
 echo " Plugins"
 echo ""
-echo "  Autotools ............................ : yes"
-echo "  C Language Pack ...................... : yes"
+echo "  Autotools ............................ : ${enable_autotools_plugin}"
+echo "  C Language Pack ...................... : ${enable_c_pack_plugin}"
 echo "  Clang ................................ : ${enable_clang_plugin}"
-echo "  Command Bar .......................... : yes"
-echo "  Ctags ................................ : yes"
+echo "  Command Bar .......................... : ${enable_command_bar_plugin}"
+echo "  Ctags ................................ : ${enable_ctags_plugin}"
 echo "  Devhelp .............................. : ${enable_devhelp_plugin}"
-echo "  Device Manager ....................... : yes"
-echo "  GNOME Code Assistance ................ : yes"
-echo "  Global File Search ................... : yes"
-echo "  HTML Language Pack ................... : yes"
+echo "  Device Manager ....................... : ${enable_device_manager_plugin}"
+echo "  GNOME Code Assistance ................ : ${enable_gnome_code_assistance_plugin}"
+echo "  Global File Search ................... : ${enable_file_search_plugin}"
+echo "  HTML Autocompletion .................. : ${enable_html_completion_plugin}"
 echo "  HTML and Markdown Preview ............ : ${enable_html_preview_plugin}"
-echo "  MinGW ................................ : yes"
-echo "  Python GObject Introspection ......... : yes"
-echo "  Python Jedi Autocompletion ........... : yes"
-echo "  Python Language Pack ................. : yes"
-echo "  Symbol Monitor ....................... : yes"
-echo "  Symbol Tree .......................... : yes"
+echo "  MinGW ................................ : ${enable_mingw_plugin}"
+echo "  Python GObject Introspection ......... : ${enable_python_gi_imports_completion_plugin}"
+echo "  Python Jedi Autocompletion ........... : ${enable_jedi_plugin}"
+echo "  Python Language Pack ................. : ${enable_python_pack_plugin}"
+echo "  System Monitor ....................... : ${enable_sysmon_plugin}"
+echo "  Symbol Tree .......................... : ${enable_symbol_tree_plugin}"
 echo "  Terminal ............................. : ${enable_terminal_plugin}"
-echo "  XML Language Pack .................... : yes"
+echo "  XML Language Pack .................... : ${enable_xml_pack_plugin}"
 echo ""
diff --git a/plugins/autotools/Makefile.am b/plugins/autotools/Makefile.am
index d601243..9a01356 100644
--- a/plugins/autotools/Makefile.am
+++ b/plugins/autotools/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_AUTOTOOLS_PLUGIN
+
 plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libautotools-plugin.la
 dist_plugin_DATA = autotools.plugin
@@ -29,6 +31,8 @@ libautotools_plugin_la_LDFLAGS = \
        -module \
        $(NULL)
 
--include $(top_srcdir)/git.mk
-
 include $(top_srcdir)/plugins/Makefile.plugin
+
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/autotools/configure.ac b/plugins/autotools/configure.ac
new file mode 100644
index 0000000..e0b2f89
--- /dev/null
+++ b/plugins/autotools/configure.ac
@@ -0,0 +1,12 @@
+# --enable-autotools-plugin=yes/no
+AC_ARG_ENABLE([enable-autotools-plugin],
+              [AS_HELP_STRING([--enable-autotools-plugin=@<:@yes/no@:>@],
+                              [Build with support for autotools projects.])],
+              [],
+              [enable_autotools_plugin=yes])
+
+# for if ENABLE_AUTOTOOLS_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_AUTOTOOLS_PLUGIN, test x$enable_autotools_plugin != xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/autotools/Makefile])
diff --git a/plugins/c-pack/Makefile.am b/plugins/c-pack/Makefile.am
index 1d3b387..241aace 100644
--- a/plugins/c-pack/Makefile.am
+++ b/plugins/c-pack/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_C_PACK_PLUGIN
+
 EXTRA_DIST = $(plugin_DATA)
 
 plugindir = $(libdir)/gnome-builder/plugins
@@ -25,6 +27,8 @@ libc_pack_plugin_la_LDFLAGS = \
        -module \
        $(NULL)
 
--include $(top_srcdir)/git.mk
-
 include $(top_srcdir)/plugins/Makefile.plugin
+
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/c-pack/configure.ac b/plugins/c-pack/configure.ac
new file mode 100644
index 0000000..4d03e0a
--- /dev/null
+++ b/plugins/c-pack/configure.ac
@@ -0,0 +1,12 @@
+# --enable-c-pack-plugin=yes/no
+AC_ARG_ENABLE([enable-c-pack-plugin],
+              [AS_HELP_STRING([--enable-c-pack-plugin=@<:@yes/no@:>@],
+                              [Build with language features for C such as auto-formatting.])],
+              [],
+              [enable_c_pack_plugin=yes])
+
+# for if ENABLE_C_PACK_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_C_PACK_PLUGIN, test x$enable_c_pack_plugin != xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/c-pack/Makefile])
diff --git a/plugins/clang/configure.ac b/plugins/clang/configure.ac
new file mode 100644
index 0000000..d159e02
--- /dev/null
+++ b/plugins/clang/configure.ac
@@ -0,0 +1,38 @@
+# --enable-clang-plugin=yes/no
+AC_ARG_ENABLE([enable-clang-plugin],
+              [AS_HELP_STRING([--enable-clang-plugin=@<:@auto/yes/no@:>@],
+                              [Build with support for the clang compiler toolchain.])],
+              [],
+              [enable_clang_plugin=auto])
+
+# If clang is auto/yes, check that it is available.
+AS_IF([test "$enable_clang_plugin" != "no"],[
+       real_enable_clang_plugin=$enable_clang_plugin
+       enable_clang_plugin=no
+       AC_CHECK_PROGS([LLVM_CONFIG], [llvm-config-3.5 llvm-config35 llvm-config], [])
+       AS_IF([test "x$LLVM_CONFIG" = "x"],[],[
+               CLANG_INCLUDEDIR=`$LLVM_CONFIG --includedir`
+               CLANG_CFLAGS="-I$CLANG_INCLUDEDIR"
+               CLANG_LDFLAGS=`$LLVM_CONFIG --ldflags`
+               AC_SUBST([CLANG_INCLUDEDIR])
+               AC_SUBST([CLANG_CFLAGS])
+               AC_SUBST([CLANG_LDFLAGS])
+               CPPFLAGS_SAVE=${CPPFLAGS}
+               CPPFLAGS=-I${CLANG_INCLUDEDIR}
+               AC_CHECK_HEADER([clang-c/Index.h], [enable_clang_plugin=yes], [
+                   AC_MSG_RESULT([Failed to locage clang-c/Index.h. Please install clang-devel.])
+               ])
+               CPPFLAGS=${CPPFLAGS_SAVE}
+       ])
+
+       # Bail if --enable-clang-plugin=yes and we failed to locate it.
+       AS_IF([test "$real_enable_clang_plugin" = "yes" && test "$enable_clang_plugin" = "no"],[
+               AC_MSG_ERROR([Failed to locate clang dependencies.])
+       ])
+])
+
+# for if ENABLE_CLANG_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_CLANG_PLUGIN, test x$enable_clang_plugin = xyes)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/clang/Makefile])
diff --git a/plugins/command-bar/Makefile.am b/plugins/command-bar/Makefile.am
index df94ced..7d7bc39 100644
--- a/plugins/command-bar/Makefile.am
+++ b/plugins/command-bar/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_COMMAND_BAR_PLUGIN
+
 DISTCLEANFILES =
 BUILT_SOURCES =
 CLEANFILES =
@@ -64,6 +66,8 @@ glib_resources_xml = gb-command-bar.gresource.xml
 glib_resources_namespace = gb_command_bar
 include $(top_srcdir)/build/autotools/Makefile.am.gresources
 
--include $(top_srcdir)/git.mk
-
 include $(top_srcdir)/plugins/Makefile.plugin
+
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/command-bar/configure.ac b/plugins/command-bar/configure.ac
new file mode 100644
index 0000000..a219a03
--- /dev/null
+++ b/plugins/command-bar/configure.ac
@@ -0,0 +1,12 @@
+# --enable-command-bar-plugin=yes/no
+AC_ARG_ENABLE([enable-command-bar-plugin],
+              [AS_HELP_STRING([--enable-command-bar-plugin=@<:@yes/no@:>@],
+                              [Build with support for the workbench command-bar.])],
+              [],
+              [enable_command_bar_plugin=yes])
+
+# for if ENABLE_COMMAND_BAR_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_COMMAND_BAR_PLUGIN, test x$enable_command_bar_plugin != xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/command-bar/Makefile])
diff --git a/plugins/ctags/Makefile.am b/plugins/ctags/Makefile.am
index bd07ba6..5773681 100644
--- a/plugins/ctags/Makefile.am
+++ b/plugins/ctags/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_CTAGS_PLUGIN
+
 plugindir = $(libdir)/gnome-builder/plugins
 plugin_LTLIBRARIES = libctags-plugin.la
 dist_plugin_DATA = ctags.plugin
@@ -34,6 +36,8 @@ libctags_plugin_la_LDFLAGS = \
        -module \
        $(NULL)
 
--include $(top_srcdir)/git.mk
-
 include $(top_srcdir)/plugins/Makefile.plugin
+
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/ctags/configure.ac b/plugins/ctags/configure.ac
new file mode 100644
index 0000000..ae6449f
--- /dev/null
+++ b/plugins/ctags/configure.ac
@@ -0,0 +1,14 @@
+# --enable-ctags-plugin=yes/no
+AC_ARG_ENABLE([enable-ctags-plugin],
+              [AS_HELP_STRING([--enable-ctags-plugin=@<:@yes/no@:>@],
+                              [Build with support for ctags auto-completion.])],
+              [],
+              [enable_ctags_plugin=yes])
+
+AC_CHECK_PROGS([ECTAGS], [ctags-exuberant exctags ectags], [ctags])
+
+# for if ENABLE_CTAGS_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_CTAGS_PLUGIN, test x$enable_ctags_plugin != xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/ctags/Makefile])
diff --git a/plugins/devhelp/Makefile.am b/plugins/devhelp/Makefile.am
index 57bfd15..686f0a3 100644
--- a/plugins/devhelp/Makefile.am
+++ b/plugins/devhelp/Makefile.am
@@ -57,9 +57,8 @@ glib_resources_xml = gb-devhelp.gresource.xml
 glib_resources_namespace = gb_devhelp
 include $(top_srcdir)/build/autotools/Makefile.am.gresources
 
-endif
+include $(top_srcdir)/plugins/Makefile.plugin
 
+endif
 
 -include $(top_srcdir)/git.mk
-
-include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/devhelp/configure.ac b/plugins/devhelp/configure.ac
new file mode 100644
index 0000000..f544bdb
--- /dev/null
+++ b/plugins/devhelp/configure.ac
@@ -0,0 +1,3 @@
+PKG_CHECK_MODULES(DEVHELP, [libdevhelp-3.0 >= 3.16.0], [enable_devhelp_plugin=yes], 
[enable_devhelp_plugin=no])
+AM_CONDITIONAL(ENABLE_DEVHELP_PLUGIN, test x$enable_devhelp_plugin != xno)
+AC_CONFIG_FILES([plugins/devhelp/Makefile])
diff --git a/plugins/device-manager/Makefile.am b/plugins/device-manager/Makefile.am
index c764217..3292fa9 100644
--- a/plugins/device-manager/Makefile.am
+++ b/plugins/device-manager/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_DEVICE_MANAGER_PLUGIN
+
 DISTCLEANFILES =
 BUILT_SOURCES =
 CLEANFILES =
@@ -44,7 +46,8 @@ glib_resources_xml = gb-device-manager.gresource.xml
 glib_resources_namespace = gb_device_manager
 include $(top_srcdir)/build/autotools/Makefile.am.gresources
 
+include $(top_srcdir)/plugins/Makefile.plugin
 
--include $(top_srcdir)/git.mk
+endif
 
-include $(top_srcdir)/plugins/Makefile.plugin
+-include $(top_srcdir)/git.mk
diff --git a/plugins/device-manager/configure.ac b/plugins/device-manager/configure.ac
new file mode 100644
index 0000000..0b97d73
--- /dev/null
+++ b/plugins/device-manager/configure.ac
@@ -0,0 +1,12 @@
+# --enable-device-manager-plugin=yes/no
+AC_ARG_ENABLE([enable-device-manager-plugin],
+              [AS_HELP_STRING([--enable-device-manager-plugin=@<:@yes/no@:>@],
+                              [Build with support for the device manager panel.])],
+              [],
+              [enable_device_manager_plugin=yes])
+
+# for if ENABLE_DEVICE_MANAGER_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_DEVICE_MANAGER_PLUGIN, test x$enable_device_manager_plugin != xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/device-manager/Makefile])
diff --git a/plugins/file-search/configure.ac b/plugins/file-search/configure.ac
new file mode 100644
index 0000000..ba780a2
--- /dev/null
+++ b/plugins/file-search/configure.ac
@@ -0,0 +1,12 @@
+# --enable-file-search-plugin=yes/no
+AC_ARG_ENABLE([enable-file-search-plugin],
+              [AS_HELP_STRING([--enable-file-search-plugin=@<:@yes/no@:>@],
+                              [Build with support for searching files in global search.])],
+              [],
+              [enable_file_search_plugin=yes])
+
+# for if ENABLE_FILE_SEARCH_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_FILE_SEARCH_PLUGIN, test x$enable_file_search_plugin != xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/file-search/Makefile])
diff --git a/plugins/gnome-code-assistance/Makefile.am b/plugins/gnome-code-assistance/Makefile.am
index 9f56261..18fb740 100644
--- a/plugins/gnome-code-assistance/Makefile.am
+++ b/plugins/gnome-code-assistance/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_GNOME_CODE_ASSISTANCE_PLUGIN
+
 EXTRA_DIST = $(plugin_DATA)
 
 plugindir = $(libdir)/gnome-builder/plugins
@@ -29,6 +31,8 @@ libgnome_code_assistance_plugin_la_LDFLAGS = \
        -module \
        $(NULL)
 
--include $(top_srcdir)/git.mk
-
 include $(top_srcdir)/plugins/Makefile.plugin
+
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/gnome-code-assistance/configure.ac b/plugins/gnome-code-assistance/configure.ac
new file mode 100644
index 0000000..dd2d7c5
--- /dev/null
+++ b/plugins/gnome-code-assistance/configure.ac
@@ -0,0 +1,12 @@
+# --enable-gnome-code-assistance-plugin=yes/no
+AC_ARG_ENABLE([enable-gnome-code-assistance-plugin],
+              [AS_HELP_STRING([--enable-gnome-code-assistance-plugin=@<:@yes/no@:>@],
+                              [Build with support for gnome-code-assistance.])],
+              [],
+              [enable_gnome_code_assistance_plugin=yes])
+
+# for if ENABLE_GNOME_CODE_ASSISTANCE_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_GNOME_CODE_ASSISTANCE_PLUGIN, test x$enable_gnome_code_assistance_plugin != xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/gnome-code-assistance/Makefile])
diff --git a/plugins/html-completion/Makefile.am b/plugins/html-completion/Makefile.am
index c66d2b4..0557ac0 100644
--- a/plugins/html-completion/Makefile.am
+++ b/plugins/html-completion/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_HTML_COMPLETION_PLUGIN
+
 EXTRA_DIST = $(plugin_DATA)
 
 plugindir = $(libdir)/gnome-builder/plugins
@@ -21,6 +23,8 @@ libhtml_completion_plugin_la_LDFLAGS = \
        -module \
        $(NULL)
 
--include $(top_srcdir)/git.mk
-
 include $(top_srcdir)/plugins/Makefile.plugin
+
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/html-completion/configure.ac b/plugins/html-completion/configure.ac
new file mode 100644
index 0000000..521c402
--- /dev/null
+++ b/plugins/html-completion/configure.ac
@@ -0,0 +1,12 @@
+# --enable-html-completion-plugin=yes/no
+AC_ARG_ENABLE([enable-html-completion-plugin],
+              [AS_HELP_STRING([--enable-html-completion-plugin=@<:@yes/no@:>@],
+                              [Build with support for autocompletion in HTML documents.])],
+              [],
+              [enable_html_completion_plugin=yes])
+
+# for if ENABLE_HTML_COMPLETION_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_HTML_COMPLETION_PLUGIN, test x$enable_html_completion_plugin != xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/html-completion/Makefile])
diff --git a/plugins/html-preview/configure.ac b/plugins/html-preview/configure.ac
new file mode 100644
index 0000000..882ef8f
--- /dev/null
+++ b/plugins/html-preview/configure.ac
@@ -0,0 +1,20 @@
+PKG_CHECK_MODULES(HTML_PREVIEW,
+                  [webkit2gtk-4.0 >= 2.8.4],
+                  [have_html_preview_deps=yes],
+                  [have_html_preview_deps=no])
+
+AC_ARG_ENABLE([enable-html-preview-plugin],
+              [AS_HELP_STRING([--enable-html-preview-plugin=@<:@auto/yes/no@:>@],
+                              [Build with support for HTML and Markdown live preview.])],
+              [],
+              [enable_html_preview_plugin=$have_html_preview_deps])
+
+AS_IF([test "$enable_html_preview_plugin" = "yes" && test "$have_html_preview_deps" = "no"],[
+       AC_MSG_ERROR([Failed to locate webkit2gtk-4.0. Try installing webkitgtk4-devel.])
+])
+
+# for if ENABLE_CLANG_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_HTML_PREVIEW_PLUGIN, test x$enable_html_preview_plugin = xyes)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/html-preview/Makefile])
diff --git a/plugins/jedi/Makefile.am b/plugins/jedi/Makefile.am
index 6fde596..5e4db83 100644
--- a/plugins/jedi/Makefile.am
+++ b/plugins/jedi/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_JEDI_PLUGIN
+
 EXTRA_DIST = $(plugin_DATA)
 
 plugindir = $(libdir)/gnome-builder/plugins
@@ -7,4 +9,6 @@ dist_plugin_DATA = \
 
 GITIGNOREFILES = __pycache__
 
+endif
+
 -include $(top_srcdir)/git.mk
diff --git a/plugins/jedi/configure.ac b/plugins/jedi/configure.ac
new file mode 100644
index 0000000..64658f3
--- /dev/null
+++ b/plugins/jedi/configure.ac
@@ -0,0 +1,12 @@
+# --enable-jedi-plugin=yes/no
+AC_ARG_ENABLE([enable-jedi-plugin],
+              [AS_HELP_STRING([--enable-jedi-plugin=@<:@yes/no@:>@],
+                              [Build with support for Python autocompletion using Jedi.])],
+              [],
+              [enable_jedi_plugin=yes])
+
+# for if ENABLE_JEDI_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_JEDI_PLUGIN, test x$enable_jedi_plugin != xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/jedi/Makefile])
diff --git a/plugins/mingw/Makefile.am b/plugins/mingw/Makefile.am
index 3b13abd..66c9bea 100644
--- a/plugins/mingw/Makefile.am
+++ b/plugins/mingw/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_MINGW_PLUGIN
+
 EXTRA_DIST = $(plugin_DATA)
 
 plugindir = $(libdir)/gnome-builder/plugins
@@ -23,6 +25,8 @@ libmingw_plugin_la_LDFLAGS = \
        -module \
        $(NULL)
 
--include $(top_srcdir)/git.mk
-
 include $(top_srcdir)/plugins/Makefile.plugin
+
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/mingw/configure.ac b/plugins/mingw/configure.ac
new file mode 100644
index 0000000..c486c41
--- /dev/null
+++ b/plugins/mingw/configure.ac
@@ -0,0 +1,12 @@
+# --enable-mingw-plugin=yes/no
+AC_ARG_ENABLE([enable-mingw-plugin],
+              [AS_HELP_STRING([--enable-mingw-plugin=@<:@yes/no@:>@],
+                              [Build with support for the mingw compiler.])],
+              [],
+              [enable_mingw_plugin=yes])
+
+# for if ENABLE_MINGW_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_MINGW_PLUGIN, test x$enable_mingw_plugin != xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/mingw/Makefile])
diff --git a/plugins/python-gi-imports-completion/Makefile.am 
b/plugins/python-gi-imports-completion/Makefile.am
index 5d5136e..9e61fc5 100644
--- a/plugins/python-gi-imports-completion/Makefile.am
+++ b/plugins/python-gi-imports-completion/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_PYTHON_GI_IMPORTS_COMPLETION_PLUGIN
+
 EXTRA_DIST = $(plugin_DATA)
 
 plugindir = $(libdir)/gnome-builder/plugins
@@ -7,4 +9,6 @@ dist_plugin_DATA = \
 
 GITIGNOREFILES = __pycache__
 
+endif
+
 -include $(top_srcdir)/git.mk
diff --git a/plugins/python-gi-imports-completion/configure.ac 
b/plugins/python-gi-imports-completion/configure.ac
new file mode 100644
index 0000000..6fa4480
--- /dev/null
+++ b/plugins/python-gi-imports-completion/configure.ac
@@ -0,0 +1,12 @@
+# --enable-python-gi-imports-completion-plugin=yes/no
+AC_ARG_ENABLE([enable-python-gi-imports-completion-plugin],
+              [AS_HELP_STRING([--enable-python-gi-imports-completion-plugin=@<:@yes/no@:>@],
+                              [Build with support for autocompletion of GObject Introspection in Python. 
Requires Jedi.])],
+              [],
+              [enable_python_gi_imports_completion_plugin=yes])
+
+# for if ENABLE_PYTHON_GI_IMPORTS_COMPLETION_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_PYTHON_GI_IMPORTS_COMPLETION_PLUGIN, test x$enable_python_gi_imports_completion_plugin 
!= xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/python-gi-imports-completion/Makefile])
diff --git a/plugins/python-pack/Makefile.am b/plugins/python-pack/Makefile.am
index 09cd43e..ade3846 100644
--- a/plugins/python-pack/Makefile.am
+++ b/plugins/python-pack/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_PYTHON_PACK_PLUGIN
+
 EXTRA_DIST = $(plugin_DATA)
 
 plugindir = $(libdir)/gnome-builder/plugins
@@ -23,6 +25,8 @@ libpython_pack_plugin_la_LDFLAGS = \
        -module \
        $(NULL)
 
--include $(top_srcdir)/git.mk
-
 include $(top_srcdir)/plugins/Makefile.plugin
+
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/python-pack/configure.ac b/plugins/python-pack/configure.ac
new file mode 100644
index 0000000..bc9bba0
--- /dev/null
+++ b/plugins/python-pack/configure.ac
@@ -0,0 +1,12 @@
+# --enable-python-pack-plugin=yes/no
+AC_ARG_ENABLE([enable-python-pack-plugin],
+              [AS_HELP_STRING([--enable-python-pack-plugin=@<:@yes/no@:>@],
+                              [Build with support for Python, including an auto indenter.])],
+              [],
+              [enable_python_pack_plugin=yes])
+
+# for if ENABLE_PYTHON_PACK_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_PYTHON_PACK_PLUGIN, test x$enable_python_pack_plugin != xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/python-pack/Makefile])
diff --git a/plugins/symbol-tree/Makefile.am b/plugins/symbol-tree/Makefile.am
index 9dce289..7b8e018 100644
--- a/plugins/symbol-tree/Makefile.am
+++ b/plugins/symbol-tree/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_SYMBOL_TREE_PLUGIN
+
 DISTCLEANFILES =
 BUILT_SOURCES =
 CLEANFILES =
@@ -47,7 +49,8 @@ glib_resources_xml = symbol-tree.gresource.xml
 glib_resources_namespace = symbol_tree
 include $(top_srcdir)/build/autotools/Makefile.am.gresources
 
+include $(top_srcdir)/plugins/Makefile.plugin
 
--include $(top_srcdir)/git.mk
+endif
 
-include $(top_srcdir)/plugins/Makefile.plugin
+-include $(top_srcdir)/git.mk
diff --git a/plugins/symbol-tree/configure.ac b/plugins/symbol-tree/configure.ac
new file mode 100644
index 0000000..46415ba
--- /dev/null
+++ b/plugins/symbol-tree/configure.ac
@@ -0,0 +1,12 @@
+# --enable-symbol-tree-plugin=yes/no
+AC_ARG_ENABLE([enable-symbol-tree-plugin],
+              [AS_HELP_STRING([--enable-symbol-tree-plugin=@<:@yes/no@:>@],
+                              [Display a symbol tree for the current document.])],
+              [],
+              [enable_symbol_tree_plugin=yes])
+
+# for if ENABLE_SYMBOL_TREE_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_SYMBOL_TREE_PLUGIN, test x$enable_symbol_tree_plugin != xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/symbol-tree/Makefile])
diff --git a/plugins/sysmon/Makefile.am b/plugins/sysmon/Makefile.am
index b91a5e6..8b1a8f9 100644
--- a/plugins/sysmon/Makefile.am
+++ b/plugins/sysmon/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_SYSMON_PLUGIN
+
 DISTCLEANFILES =
 BUILT_SOURCES =
 CLEANFILES =
@@ -45,7 +47,8 @@ glib_resources_xml = gb-sysmon.gresource.xml
 glib_resources_namespace = gb_sysmon
 include $(top_srcdir)/build/autotools/Makefile.am.gresources
 
+include $(top_srcdir)/plugins/Makefile.plugin
 
--include $(top_srcdir)/git.mk
+endif
 
-include $(top_srcdir)/plugins/Makefile.plugin
+-include $(top_srcdir)/git.mk
diff --git a/plugins/sysmon/configure.ac b/plugins/sysmon/configure.ac
new file mode 100644
index 0000000..e869737
--- /dev/null
+++ b/plugins/sysmon/configure.ac
@@ -0,0 +1,12 @@
+# --enable-sysmon-plugin=yes/no
+AC_ARG_ENABLE([enable-sysmon-plugin],
+              [AS_HELP_STRING([--enable-sysmon-plugin=@<:@yes/no@:>@],
+                              [Build with support for a simple system monitor.])],
+              [],
+              [enable_sysmon_plugin=yes])
+
+# for if ENABLE_SYSMON_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_SYSMON_PLUGIN, test x$enable_sysmon_plugin != xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/sysmon/Makefile])
diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am
index 1eb17c2..d64f931 100644
--- a/plugins/terminal/Makefile.am
+++ b/plugins/terminal/Makefile.am
@@ -32,7 +32,7 @@ nodist_libterminal_la_SOURCES = \
 
 libterminal_la_CFLAGS = \
        $(BUILDER_CFLAGS) \
-       $(VTE_CFLAGS) \
+       $(TERMINAL_CFLAGS) \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/app \
@@ -46,7 +46,7 @@ libterminal_la_CFLAGS = \
 
 libterminal_la_LIBADD = \
        $(BUILDER_LIBS) \
-       $(VTE_LIBS) \
+       $(TERMINAL_LIBS) \
        $(NULL)
 
 libterminal_la_LDFLAGS = \
@@ -60,9 +60,8 @@ glib_resources_xml = gb-terminal.gresource.xml
 glib_resources_namespace = gb_terminal
 include $(top_srcdir)/build/autotools/Makefile.am.gresources
 
-endif
+include $(top_srcdir)/plugins/Makefile.plugin
 
+endif
 
 -include $(top_srcdir)/git.mk
-
-include $(top_srcdir)/plugins/Makefile.plugin
diff --git a/plugins/terminal/configure.ac b/plugins/terminal/configure.ac
new file mode 100644
index 0000000..8bbd298
--- /dev/null
+++ b/plugins/terminal/configure.ac
@@ -0,0 +1,20 @@
+PKG_CHECK_MODULES(TERMINAL,
+                  [vte-2.91 >= 0.40.2],
+                  [have_vte=yes],
+                  [have_vte=no])
+
+AC_ARG_ENABLE([enable-terminal-plugin],
+              [AS_HELP_STRING([--enable-terminal-plugin=@<:@auto/yes/no@:>@],
+                              [Build with support for a VTE-based terminal.])],
+              [],
+              [enable_terminal_plugin=$have_vte])
+
+AS_IF([test "$enable_terminal_plugin" = "yes" && test "$have_vte" = "no"],[
+       AC_MSG_ERROR([Failed to locate vte dependencies. Try installing vte291-devel.])
+])
+
+# for if ENABLE_CLANG_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_TERMINAL_PLUGIN, test x$enable_terminal_plugin = xyes)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/terminal/Makefile])
diff --git a/plugins/xml-pack/Makefile.am b/plugins/xml-pack/Makefile.am
index e033180..c454010 100644
--- a/plugins/xml-pack/Makefile.am
+++ b/plugins/xml-pack/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_XML_PACK_PLUGIN
+
 EXTRA_DIST = $(plugin_DATA)
 
 plugindir = $(libdir)/gnome-builder/plugins
@@ -27,6 +29,8 @@ libxml_pack_plugin_la_LDFLAGS = \
        -module \
        $(NULL)
 
--include $(top_srcdir)/git.mk
-
 include $(top_srcdir)/plugins/Makefile.plugin
+
+endif
+
+-include $(top_srcdir)/git.mk
diff --git a/plugins/xml-pack/configure.ac b/plugins/xml-pack/configure.ac
new file mode 100644
index 0000000..e2f52b8
--- /dev/null
+++ b/plugins/xml-pack/configure.ac
@@ -0,0 +1,12 @@
+# --enable-xml-pack-plugin=yes/no
+AC_ARG_ENABLE([enable-xml-pack-plugin],
+              [AS_HELP_STRING([--enable-xml-pack-plugin=@<:@yes/no@:>@],
+                              [Build with support for xml enhancements such as indentation and auto 
completion.])],
+              [],
+              [enable_xml_pack_plugin=yes])
+
+# for if ENABLE_XML_PACK_PLUGIN in Makefile.am
+AM_CONDITIONAL(ENABLE_XML_PACK_PLUGIN, test x$enable_xml_pack_plugin != xno)
+
+# Ensure our makefile is generated by autoconf
+AC_CONFIG_FILES([plugins/xml-pack/Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
index daa86d8..c69ac44 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -191,7 +191,7 @@ nodist_libgnome_builder_la_SOURCES = \
 libgnome_builder_la_LIBADD = \
        $(BUILDER_LIBS) \
        $(OPTIMIZE_LDFLAGS) \
-       $(VTE_LIBS) \
+       $(TERMINAL_LIBS) \
        $(top_builddir)/data/icons/hicolor/libicons.la \
        $(top_builddir)/libide/libide-1.0.la \
        $(top_builddir)/contrib/egg/libegg-private.la \
@@ -214,7 +214,7 @@ libgnome_builder_la_CFLAGS = \
        $(BUILDER_CFLAGS) \
        $(DEBUG_CFLAGS) \
        $(OPTIMIZE_CFLAGS) \
-       $(VTE_CFLAGS) \
+       $(TERMINAL_CFLAGS) \
        -I$(builddir)/resources \
        -I$(builddir)/util \
        -I$(srcdir)/app \
@@ -247,7 +247,8 @@ libgnome_builder_la_CFLAGS = \
        $(NULL)
 
 
-if HAVE_VTE
+# FIXME: Move this code to terminal plugin
+if ENABLE_TERMINAL_PLUGIN
 libgnome_builder_la_CFLAGS += -DHAVE_VTE
 endif
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]