[gtksourceview/wip/always-build-completion-provider: 1/2] Always build words completion provider
- From: SĂŠbastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview/wip/always-build-completion-provider: 1/2] Always build words completion provider
- Date: Sat, 25 Jun 2016 11:28:34 +0000 (UTC)
commit 0214d2f807fa758872155321aa3057e944e2ff4f
Author: SĂŠbastien Wilmet <swilmet gnome org>
Date: Sat Jun 25 13:02:14 2016 +0200
Always build words completion provider
The words completion provider is not a lot of code and doesn't pull up
additional dependencies.
Currently, applications need the following #include to use the words
completion provider:
#include <gtksourceview/completion-providers/words/gtksourcecompletionwords.h>
By always building the completion provider, it'll be easier to #include
that header in gtksource.h (it'll be done in a later commit), so that
applications have just one header to #include, it'll be simpler.
build/win32/vs10/gtksourceview-build-defines.props | 2 +-
.../win32/vs9/gtksourceview-build-defines.vsprops | 2 +-
configure.ac | 9 ---------
gtksourceview/Makefile.am | 2 --
4 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/build/win32/vs10/gtksourceview-build-defines.props
b/build/win32/vs10/gtksourceview-build-defines.props
index 91844ea..3f7c41e 100644
--- a/build/win32/vs10/gtksourceview-build-defines.props
+++ b/build/win32/vs10/gtksourceview-build-defines.props
@@ -4,7 +4,7 @@
<Import Project="gtksourceview-version-paths.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
-
<GtkSourceBuildDefines>G_LOG_DOMAIN="GtkSourceView";ENABLE_PROVIDERS;GTK_SOURCE_VERSION_MIN_REQUIRED=GTK_SOURCE_VERSION_3_0</GtkSourceBuildDefines>
+
<GtkSourceBuildDefines>G_LOG_DOMAIN="GtkSourceView";GTK_SOURCE_VERSION_MIN_REQUIRED=GTK_SOURCE_VERSION_3_0</GtkSourceBuildDefines>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>gtksourceviewbuilddefinesprops</_PropertySheetDisplayName>
diff --git a/build/win32/vs9/gtksourceview-build-defines.vsprops
b/build/win32/vs9/gtksourceview-build-defines.vsprops
index 0d7a2a4..5d28be3 100644
--- a/build/win32/vs9/gtksourceview-build-defines.vsprops
+++ b/build/win32/vs9/gtksourceview-build-defines.vsprops
@@ -21,6 +21,6 @@
/>
<UserMacro
Name="GtkSourceBuildDefines"
-
Value="G_LOG_DOMAIN=\"GtkSourceView\";ENABLE_PROVIDERS;GTK_SOURCE_VERSION_MIN_REQUIRED=GTK_SOURCE_VERSION_3_0"
+
Value="G_LOG_DOMAIN=\"GtkSourceView\";GTK_SOURCE_VERSION_MIN_REQUIRED=GTK_SOURCE_VERSION_3_0"
/>
</VisualStudioPropertySheet>
diff --git a/configure.ac b/configure.ac
index 0ba1546..482b572 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,14 +135,6 @@ AX_PKG_CHECK_MODULES([DEP],
[glib-2.0 >= $glib_req gio-2.0 >= $glib_req gtk+-3.0 >= $gtk_req],
[libxml-2.0 >= $libxml_req])
-dnl Check to enable completion providers
-AC_ARG_ENABLE(providers,
- AS_HELP_STRING([--enable-completion-providers],
- [Enable building completion providers (words)]),,
- enable_providers=yes)
-
-AM_CONDITIONAL([ENABLE_PROVIDERS], [ test "$enable_providers" = "yes" ])
-
dnl check for native osx
AC_MSG_CHECKING([for native Mac OS X])
AX_REQUIRE_DEFINED([GTK_CHECK_BACKEND])
@@ -246,7 +238,6 @@ Configuration:
Source code location: ${srcdir}
Compiler: ${CC}
- Completion Providers: ${enable_providers}
Glade Catalog: ${glade_catalog}
Documentation: ${enable_gtk_doc}
GObject introspection: ${found_introspection}
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index 29f3dcf..80ebd0b 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -1,6 +1,4 @@
-if ENABLE_PROVIDERS
SUBDIRS = completion-providers
-endif
@CODE_COVERAGE_RULES@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]