[gnome-builder] build: fix --enable plugin variables

From: Christian Hergert <chergert src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-builder] build: fix --enable plugin variables
Date: Mon, 28 Sep 2015 10:46:19 +0000 (UTC)
commit 98f0b95064e460d396ec693270c6413eb5d5573b
Author: Christian Hergert <christian hergert me>
Date:   Mon Sep 28 03:46:07 2015 -0700

    build: fix --enable plugin variables
    
    Logic bomb on my part, whoops!

 plugins/autotools/configure.ac                    |    4 ++--
 plugins/c-pack/configure.ac                       |    4 ++--
 plugins/clang/configure.ac                        |    4 ++--
 plugins/clang/ide-clang-completion-provider.c     |   13 +++++++++----
 plugins/command-bar/configure.ac                  |    4 ++--
 plugins/ctags/configure.ac                        |    4 ++--
 plugins/device-manager/configure.ac               |    4 ++--
 plugins/file-search/configure.ac                  |    4 ++--
 plugins/gnome-code-assistance/configure.ac        |    4 ++--
 plugins/html-completion/configure.ac              |    4 ++--
 plugins/html-preview/configure.ac                 |    4 ++--
 plugins/jedi/configure.ac                         |    4 ++--
 plugins/mingw/configure.ac                        |    4 ++--
 plugins/python-gi-imports-completion/configure.ac |    4 ++--
 plugins/python-pack/configure.ac                  |    4 ++--
 plugins/symbol-tree/configure.ac                  |    4 ++--
 plugins/sysmon/configure.ac                       |    4 ++--
 plugins/terminal/configure.ac                     |   11 ++++-------
 plugins/vala-pack/configure.ac                    |    6 +++---
 plugins/xml-pack/configure.ac                     |    4 ++--
 20 files changed, 50 insertions(+), 48 deletions(-)
---
diff --git a/plugins/autotools/configure.ac b/plugins/autotools/configure.ac
index e0b2f89..2fe28bc 100644
--- a/plugins/autotools/configure.ac
+++ b/plugins/autotools/configure.ac
@@ -1,8 +1,8 @@
 # --enable-autotools-plugin=yes/no
-AC_ARG_ENABLE([enable-autotools-plugin],
+AC_ARG_ENABLE([autotools-plugin],
               [AS_HELP_STRING([--enable-autotools-plugin=@<:@yes/no@:>@],
                               [Build with support for autotools projects.])],
-              [],
+              [enable_autotools_plugin=$enableval],
               [enable_autotools_plugin=yes])
 
 # for if ENABLE_AUTOTOOLS_PLUGIN in Makefile.am
diff --git a/plugins/c-pack/configure.ac b/plugins/c-pack/configure.ac
index 4d03e0a..b1b208d 100644
--- a/plugins/c-pack/configure.ac
+++ b/plugins/c-pack/configure.ac
@@ -1,8 +1,8 @@
 # --enable-c-pack-plugin=yes/no
-AC_ARG_ENABLE([enable-c-pack-plugin],
+AC_ARG_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=$enableval],
               [enable_c_pack_plugin=yes])
 
 # for if ENABLE_C_PACK_PLUGIN in Makefile.am
diff --git a/plugins/clang/configure.ac b/plugins/clang/configure.ac
index d159e02..750cb34 100644
--- a/plugins/clang/configure.ac
+++ b/plugins/clang/configure.ac
@@ -1,8 +1,8 @@
 # --enable-clang-plugin=yes/no
-AC_ARG_ENABLE([enable-clang-plugin],
+AC_ARG_ENABLE([clang-plugin],
               [AS_HELP_STRING([--enable-clang-plugin=@<:@auto/yes/no@:>@],
                               [Build with support for the clang compiler toolchain.])],
-              [],
+              [enable_clang_plugin=$enableval],
               [enable_clang_plugin=auto])
 
 # If clang is auto/yes, check that it is available.
diff --git a/plugins/clang/ide-clang-completion-provider.c b/plugins/clang/ide-clang-completion-provider.c
index 06c2d3e..14ab201 100644
--- a/plugins/clang/ide-clang-completion-provider.c
+++ b/plugins/clang/ide-clang-completion-provider.c
@@ -448,10 +448,7 @@ ide_clang_completion_provider_populate (GtkSourceCompletionProvider *provider,
   g_return_if_fail (GTK_SOURCE_IS_COMPLETION_CONTEXT (context));
 
   if (!gtk_source_completion_context_get_iter (context, &iter))
-    {
-      gtk_source_completion_context_add_proposals (context, provider, NULL, TRUE);
-      return;
-    }
+    IDE_GOTO (failure);
 
   buffer = gtk_text_iter_get_buffer (&iter);
 
@@ -465,6 +462,9 @@ ide_clang_completion_provider_populate (GtkSourceCompletionProvider *provider,
   if (!gtk_text_iter_starts_line (&stop))
     gtk_text_iter_backward_char (&stop);
 
+  if (gtk_text_iter_get_char (&stop) == ';')
+    IDE_GOTO (failure);
+
   /*
    * Walk backwards to locate the first character after a stop character.
    * A stop character is anything that can't go in a function/type.
@@ -540,6 +540,11 @@ ide_clang_completion_provider_populate (GtkSourceCompletionProvider *provider,
                                                 state);
 
   IDE_EXIT;
+
+failure:
+  gtk_source_completion_context_add_proposals (context, provider, NULL, TRUE);
+
+  IDE_EXIT;
 }
 
 static gboolean
diff --git a/plugins/command-bar/configure.ac b/plugins/command-bar/configure.ac
index a219a03..fac2f59 100644
--- a/plugins/command-bar/configure.ac
+++ b/plugins/command-bar/configure.ac
@@ -1,8 +1,8 @@
 # --enable-command-bar-plugin=yes/no
-AC_ARG_ENABLE([enable-command-bar-plugin],
+AC_ARG_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=$enableval],
               [enable_command_bar_plugin=yes])
 
 # for if ENABLE_COMMAND_BAR_PLUGIN in Makefile.am
diff --git a/plugins/ctags/configure.ac b/plugins/ctags/configure.ac
index ae6449f..3d13261 100644
--- a/plugins/ctags/configure.ac
+++ b/plugins/ctags/configure.ac
@@ -1,8 +1,8 @@
 # --enable-ctags-plugin=yes/no
-AC_ARG_ENABLE([enable-ctags-plugin],
+AC_ARG_ENABLE([ctags-plugin],
               [AS_HELP_STRING([--enable-ctags-plugin=@<:@yes/no@:>@],
                               [Build with support for ctags auto-completion.])],
-              [],
+              [enable_ctags_plugin=$enableval],
               [enable_ctags_plugin=yes])
 
 AC_CHECK_PROGS([ECTAGS], [ctags-exuberant exctags ectags], [ctags])
diff --git a/plugins/device-manager/configure.ac b/plugins/device-manager/configure.ac
index da3a023..86ba792 100644
--- a/plugins/device-manager/configure.ac
+++ b/plugins/device-manager/configure.ac
@@ -1,8 +1,8 @@
 # --enable-device-manager-plugin=yes/no
-AC_ARG_ENABLE([enable-device-manager-plugin],
+AC_ARG_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=$enableval],
               [enable_device_manager_plugin=no])
 
 # for if ENABLE_DEVICE_MANAGER_PLUGIN in Makefile.am
diff --git a/plugins/file-search/configure.ac b/plugins/file-search/configure.ac
index ba780a2..1171790 100644
--- a/plugins/file-search/configure.ac
+++ b/plugins/file-search/configure.ac
@@ -1,8 +1,8 @@
 # --enable-file-search-plugin=yes/no
-AC_ARG_ENABLE([enable-file-search-plugin],
+AC_ARG_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=$enableval],
               [enable_file_search_plugin=yes])
 
 # for if ENABLE_FILE_SEARCH_PLUGIN in Makefile.am
diff --git a/plugins/gnome-code-assistance/configure.ac b/plugins/gnome-code-assistance/configure.ac
index dd2d7c5..67a5c34 100644
--- a/plugins/gnome-code-assistance/configure.ac
+++ b/plugins/gnome-code-assistance/configure.ac
@@ -1,8 +1,8 @@
 # --enable-gnome-code-assistance-plugin=yes/no
-AC_ARG_ENABLE([enable-gnome-code-assistance-plugin],
+AC_ARG_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=$enableval],
               [enable_gnome_code_assistance_plugin=yes])
 
 # for if ENABLE_GNOME_CODE_ASSISTANCE_PLUGIN in Makefile.am
diff --git a/plugins/html-completion/configure.ac b/plugins/html-completion/configure.ac
index 521c402..c9e39bb 100644
--- a/plugins/html-completion/configure.ac
+++ b/plugins/html-completion/configure.ac
@@ -1,8 +1,8 @@
 # --enable-html-completion-plugin=yes/no
-AC_ARG_ENABLE([enable-html-completion-plugin],
+AC_ARG_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=$enableval],
               [enable_html_completion_plugin=yes])
 
 # for if ENABLE_HTML_COMPLETION_PLUGIN in Makefile.am
diff --git a/plugins/html-preview/configure.ac b/plugins/html-preview/configure.ac
index 882ef8f..e7e30fd 100644
--- a/plugins/html-preview/configure.ac
+++ b/plugins/html-preview/configure.ac
@@ -3,10 +3,10 @@ PKG_CHECK_MODULES(HTML_PREVIEW,
                   [have_html_preview_deps=yes],
                   [have_html_preview_deps=no])
 
-AC_ARG_ENABLE([enable-html-preview-plugin],
+AC_ARG_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=$enableval],
               [enable_html_preview_plugin=$have_html_preview_deps])
 
 AS_IF([test "$enable_html_preview_plugin" = "yes" && test "$have_html_preview_deps" = "no"],[
diff --git a/plugins/jedi/configure.ac b/plugins/jedi/configure.ac
index 64658f3..769861d 100644
--- a/plugins/jedi/configure.ac
+++ b/plugins/jedi/configure.ac
@@ -1,8 +1,8 @@
 # --enable-jedi-plugin=yes/no
-AC_ARG_ENABLE([enable-jedi-plugin],
+AC_ARG_ENABLE([jedi-plugin],
               [AS_HELP_STRING([--enable-jedi-plugin=@<:@yes/no@:>@],
                               [Build with support for Python autocompletion using Jedi.])],
-              [],
+              [enable_jedi_plugin=$enableval],
               [enable_jedi_plugin=yes])
 
 # for if ENABLE_JEDI_PLUGIN in Makefile.am
diff --git a/plugins/mingw/configure.ac b/plugins/mingw/configure.ac
index 45ebf2b..ff80049 100644
--- a/plugins/mingw/configure.ac
+++ b/plugins/mingw/configure.ac
@@ -1,8 +1,8 @@
 # --enable-mingw-plugin=yes/no
-AC_ARG_ENABLE([enable-mingw-plugin],
+AC_ARG_ENABLE([mingw-plugin],
               [AS_HELP_STRING([--enable-mingw-plugin=@<:@yes/no@:>@],
                               [Build with support for the mingw compiler.])],
-              [],
+              [enable_mingw_plugin=$enableval],
               [enable_mingw_plugin=no])
 
 # for if ENABLE_MINGW_PLUGIN in Makefile.am
diff --git a/plugins/python-gi-imports-completion/configure.ac 
b/plugins/python-gi-imports-completion/configure.ac
index 6fa4480..5750149 100644
--- a/plugins/python-gi-imports-completion/configure.ac
+++ b/plugins/python-gi-imports-completion/configure.ac
@@ -1,8 +1,8 @@
 # --enable-python-gi-imports-completion-plugin=yes/no
-AC_ARG_ENABLE([enable-python-gi-imports-completion-plugin],
+AC_ARG_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=$enableval],
               [enable_python_gi_imports_completion_plugin=yes])
 
 # for if ENABLE_PYTHON_GI_IMPORTS_COMPLETION_PLUGIN in Makefile.am
diff --git a/plugins/python-pack/configure.ac b/plugins/python-pack/configure.ac
index bc9bba0..b441b0e 100644
--- a/plugins/python-pack/configure.ac
+++ b/plugins/python-pack/configure.ac
@@ -1,8 +1,8 @@
 # --enable-python-pack-plugin=yes/no
-AC_ARG_ENABLE([enable-python-pack-plugin],
+AC_ARG_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=$enableval],
               [enable_python_pack_plugin=yes])
 
 # for if ENABLE_PYTHON_PACK_PLUGIN in Makefile.am
diff --git a/plugins/symbol-tree/configure.ac b/plugins/symbol-tree/configure.ac
index 46415ba..0a2c7df 100644
--- a/plugins/symbol-tree/configure.ac
+++ b/plugins/symbol-tree/configure.ac
@@ -1,8 +1,8 @@
 # --enable-symbol-tree-plugin=yes/no
-AC_ARG_ENABLE([enable-symbol-tree-plugin],
+AC_ARG_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=$enableval],
               [enable_symbol_tree_plugin=yes])
 
 # for if ENABLE_SYMBOL_TREE_PLUGIN in Makefile.am
diff --git a/plugins/sysmon/configure.ac b/plugins/sysmon/configure.ac
index e869737..31c1a2a 100644
--- a/plugins/sysmon/configure.ac
+++ b/plugins/sysmon/configure.ac
@@ -1,8 +1,8 @@
 # --enable-sysmon-plugin=yes/no
-AC_ARG_ENABLE([enable-sysmon-plugin],
+AC_ARG_ENABLE([sysmon-plugin],
               [AS_HELP_STRING([--enable-sysmon-plugin=@<:@yes/no@:>@],
                               [Build with support for a simple system monitor.])],
-              [],
+              [enable_sysmon_plugin=$enableval],
               [enable_sysmon_plugin=yes])
 
 # for if ENABLE_SYSMON_PLUGIN in Makefile.am
diff --git a/plugins/terminal/configure.ac b/plugins/terminal/configure.ac
index 8bbd298..9cfb190 100644
--- a/plugins/terminal/configure.ac
+++ b/plugins/terminal/configure.ac
@@ -1,15 +1,12 @@
-PKG_CHECK_MODULES(TERMINAL,
-                  [vte-2.91 >= 0.40.2],
-                  [have_vte=yes],
-                  [have_vte=no])
+PKG_CHECK_MODULES(TERMINAL, [vte-2.91 >= 0.40.2], [have_vte=yes], [have_vte=no])
 
-AC_ARG_ENABLE([enable-terminal-plugin],
+AC_ARG_ENABLE([terminal-plugin],
               [AS_HELP_STRING([--enable-terminal-plugin=@<:@auto/yes/no@:>@],
                               [Build with support for a VTE-based terminal.])],
-              [],
+              [enable_terminal_plugin=$enableval],
               [enable_terminal_plugin=$have_vte])
 
-AS_IF([test "$enable_terminal_plugin" = "yes" && test "$have_vte" = "no"],[
+AS_IF([test x$enable_terminal_plugin = xyes && test x$have_vte = xno],[
        AC_MSG_ERROR([Failed to locate vte dependencies. Try installing vte291-devel.])
 ])
 
diff --git a/plugins/vala-pack/configure.ac b/plugins/vala-pack/configure.ac
index 7baeee7..6a13a81 100644
--- a/plugins/vala-pack/configure.ac
+++ b/plugins/vala-pack/configure.ac
@@ -1,8 +1,8 @@
-# --enable-vala-pack-plugin=yes/no
-AC_ARG_ENABLE([enable-vala-pack-plugin],
+# --enable-vala-pack-plugin=auto/yes/no
+AC_ARG_ENABLE([vala-pack-plugin],
               [AS_HELP_STRING([--enable-vala-pack-plugin=@<:@auto/yes/no@:>@],
                               [Build with support for vala enhancements such as auto completion.])],
-              [],
+              [enable_vala_pack_plugin=$enableval],
               [enable_vala_pack_plugin=auto])
 
 AS_IF([test x$enable_vala_pack_plugin != xno],[
diff --git a/plugins/xml-pack/configure.ac b/plugins/xml-pack/configure.ac
index e2f52b8..fd92e9a 100644
--- a/plugins/xml-pack/configure.ac
+++ b/plugins/xml-pack/configure.ac
@@ -1,8 +1,8 @@
 # --enable-xml-pack-plugin=yes/no
-AC_ARG_ENABLE([enable-xml-pack-plugin],
+AC_ARG_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=$enableval],
               [enable_xml_pack_plugin=yes])
 
 # for if ENABLE_XML_PACK_PLUGIN in Makefile.am
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]