[gnome-code-assistance] [clients/gedit] Move back to gedit-code-assistance

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 57057df91bfe84f867cc5f863bffd01e7bc068a9
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Fri Nov 8 14:20:03 2013 +0100

    [clients/gedit] Move back to gedit-code-assistance

 Makefile.am                                        |    7 -
 clients/gedit/Makefile.am                          |    8 -
 clients/gedit/data/Makefile.am                     |   15 -
 clients/gedit/data/codeassistance.css              |   38 -
 clients/gedit/data/codeassistance.plugin.in        |    9 -
 ...ome.gedit.plugins.codeassistance.gschema.xml.in |    9 -
 clients/gedit/src/Makefile.am                      |   75 --
 clients/gedit/src/gca-app-activatable.vala         |   42 --
 clients/gedit/src/gca-backend-manager.vala         |  131 ----
 clients/gedit/src/gca-backend.vala                 |  163 -----
 clients/gedit/src/gca-dbus.vala                    |   83 ---
 clients/gedit/src/gca-diagnostic-colors.vala       |  176 -----
 clients/gedit/src/gca-diagnostic-message.vala      |  435 ------------
 clients/gedit/src/gca-diagnostic-tags.vala         |  171 -----
 clients/gedit/src/gca-diagnostic.vala              |  165 -----
 clients/gedit/src/gca-diagnostics.vala             |  714 --------------------
 clients/gedit/src/gca-document.vala                |  296 --------
 clients/gedit/src/gca-expand-range.vala            |   71 --
 clients/gedit/src/gca-log.vala                     |   81 ---
 clients/gedit/src/gca-plugin.vala                  |   30 -
 clients/gedit/src/gca-remote-service.vala          |   81 ---
 clients/gedit/src/gca-scrollbar-marker.vala        |  215 ------
 clients/gedit/src/gca-semantic-value-support.vala  |   24 -
 clients/gedit/src/gca-semantic-value.vala          |  123 ----
 clients/gedit/src/gca-source-index.vala            |  271 --------
 clients/gedit/src/gca-source-location.vala         |  127 ----
 clients/gedit/src/gca-source-range-support.vala    |   32 -
 clients/gedit/src/gca-source-range.vala            |  105 ---
 clients/gedit/src/gca-symbol-browser-support.vala  |   43 --
 clients/gedit/src/gca-symbol-browser.vala          |   56 --
 clients/gedit/src/gca-unsaved-file.vala            |   38 -
 clients/gedit/src/gca-utils-c.c                    |   76 --
 clients/gedit/src/gca-utils-c.h                    |   61 --
 clients/gedit/src/gca-view-activatable.vala        |   45 --
 clients/gedit/src/gca-view.vala                    |  211 ------
 clients/gedit/vapi/Makefile.am                     |    4 -
 clients/gedit/vapi/gca-utils.vapi                  |   12 -
 configure.ac                                       |   79 +--
 38 files changed, 5 insertions(+), 4317 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4f1720b..6f51192 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,16 +28,9 @@ GITIGNOREFILES =
 GITIGNOREDEPS =
 BUILT_SOURCES =
 DISTCLEANFILES =
-gsettings_SCHEMAS =
-
-if GEDIT_ENABLE
-include clients/gedit/Makefile.am
-endif
 
 include backends/Makefile.am
 
- GSETTINGS_RULES@
-
 dist-hook-changelog:
        @if test -d "$(srcdir)/.git"; \
        then \
diff --git a/configure.ac b/configure.ac
index 8e3cb65..c0faafe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,6 @@ AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_PROG_LIBTOOL
-
 AM_PATH_PYTHON
 
 AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip -Wno-portability subdir-objects])
@@ -53,74 +52,6 @@ color_enable_var("$enable_debug", [enable_debug_msg])
 
 AM_CONDITIONAL(ENABLE_DEBUG, test "x$enable_debug" = "xyes")
 
-AC_ARG_ENABLE([local],
-              AS_HELP_STRING([--enable-local],[enable local install (in user directory)]),
-              [enable_local=$enableval],
-              [enable_local=no])
-
-dnl ================================================================
-dnl gedit client configuration
-dnl ================================================================
-AC_ARG_ENABLE([gedit],
-              AS_HELP_STRING([--enable-gedit],[enable gedit client]),
-              [enable_gedit=$enableval],
-              [enable_gedit=auto])
-
-GEDIT_MODULES="gedit >= 3.8 gee-0.8"
-
-AM_PROG_VALAC
-PKG_PROG_PKG_CONFIG
-
-if test "x$enable_gedit" = "xauto"; then
-       PKG_CHECK_EXISTS([$GEDIT_MODULES],
-                        [enable_gedit=yes],
-                        [enable_gedit=no])
-
-       if test "x$VALAC" = "x"; then
-               enable_gedit=no
-       fi
-fi
-
-if test "x$enable_gedit" = "xyes"; then
-       PKG_CHECK_MODULES([GEDIT], $GEDIT_MODULES)
-
-       if test "x$VALAC" = "x"; then
-               AC_MSG_ERROR([Cannot find the "valac" compiler])
-       fi
-
-       gedit_prefix=`$PKG_CONFIG --variable=prefix gedit`
-
-       GEDIT_GIR_DIR="$gedit_prefix/share/gedit/gir-1.0"
-       AC_SUBST(GEDIT_GIR_DIR)
-
-       GEDIT_API_VERSION=3.0
-       AC_SUBST(GEDIT_API_VERSION)
-
-       if test "x$enable_local" = "xyes"; then
-               geditlibdir="$HOME/.local/share"
-               geditdatadir="$HOME/.local/share"
-       else
-               geditlibdir="${libdir}"
-               geditdatadir="${datadir}"
-       fi
-
-       GEDIT_PLUGIN_DIR="$geditlibdir/gedit/plugins"
-       GEDIT_DATA_DIR="$geditdatadir/gedit/plugins"
-
-       AC_SUBST(GEDIT_PLUGIN_DIR)
-       AC_SUBST(GEDIT_DATA_DIR)
-
-       AC_SUBST(GEDIT_CFLAGS)
-       AC_SUBST(GEDIT_LIBS)
-
-       GLIB_GSETTINGS
-fi
-
-color_enable_var("$enable_gedit", [enable_gedit_msg])
-
-AM_CONDITIONAL(GEDIT_ENABLE, test "x$enable_gedit" = "xyes")
-
-
 dnl ================================================================
 dnl python support
 dnl ================================================================
@@ -335,6 +266,10 @@ AC_ARG_ENABLE([vala],
 
 BACKEND_VALA_MODULES="gobject-2.0 >= 2.36 glib-2.0 >= 2.36 gio-2.0 >= 2.36 gee-0.8 libvala-0.20"
 
+if test "x$enable_vala" != "xno"; then
+       AM_PROG_VALAC
+fi
+
 if test "x$enable_vala" = "xauto"; then
        AC_MSG_CHECKING([vala backend])
 
@@ -351,6 +286,7 @@ if test "x$enable_vala" = "xauto"; then
 fi
 
 if test "x$enable_vala" != "xno"; then
+       
        if test "x$VALAC" = "x"; then
                AC_MSG_ERROR([Cannot find the "valac" compiler])
        else
@@ -443,8 +379,6 @@ AC_SUBST(GCA_RBBACKENDS_DIR_EX)
 
 AC_CONFIG_FILES([
 Makefile
-clients/gedit/data/codeassistance.plugin
-clients/gedit/data/org.gnome.gedit.plugins.codeassistance.gschema.xml
 backends/c/org.gnome.CodeAssist.c.service
 backends/c/config.py
 backends/c/c
@@ -476,8 +410,5 @@ Configuration:
                vala:           $enable_vala_msg
                go:             $enable_go_msg
                ruby:           $enable_ruby_msg
-
-       clients:
-               gedit:          $enable_gedit_msg
 "