[gnote] Remove --with-x11-support option

[Aurimas Černius <aurimasc src gnome org>]

commit 87490bfa463b822a33f4d5b1e283f0e8297baff8
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sun Jan 24 14:28:16 2016 +0200

    Remove --with-x11-support option

 Makefile.am     |    8 ++------
 configure.ac    |    6 ------
 src/Makefile.am |    6 +-----
 3 files changed, 3 insertions(+), 17 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8dfacc0..c2a90ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,13 +11,9 @@ DISTCLEANFILES = intltool-extract \
                  intltool-update \
                  po/.intltool-merge-cache
 
-if HAVE_X11_SUPPORT
-LIBTOMBOYDIR = libtomboy
-endif
+SUBDIRS = data src po help
 
-SUBDIRS = data $(LIBTOMBOYDIR) src po help
-
-DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --with-x11-support
+DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper
 
 # Ignore scrollkeeper issues for now.  @#*$& scrollkeeper (from Evince)
 
diff --git a/configure.ac b/configure.ac
index a8470b9..37d09d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,11 +128,6 @@ else
 fi
 AC_SUBST(DBUS_SERVICE_DIR)
 
-AC_ARG_WITH(x11_support, [  --with-x11-support      Compile with X11 support.],
-            [with_x11_support=yes;AC_DEFINE(HAVE_X11_SUPPORT, [1], [Define to 1 to include X11 support.])],
-            [with_x11_support=no])
-AM_CONDITIONAL(HAVE_X11_SUPPORT, test "x$with_x11_support" != "x")
-
 
 IT_PROG_INTLTOOL([0.35.0])
 
@@ -213,6 +208,5 @@ echo "
 Options:
 
   Spellchecking support:       ${FIXED_GTKSPELL}
-  X11 support:                 ${with_x11_support}
 
 "
diff --git a/src/Makefile.am b/src/Makefile.am
index 9d56af7..c7c8d84 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,11 +13,7 @@ AM_CPPFLAGS= -I$(top_srcdir) @LIBGTKMM_CFLAGS@ @LIBGLIBMM_CFLAGS@ \
 
 AM_LDFLAGS=-export-dynamic
 
-if HAVE_X11_SUPPORT
-LIBTOMBOY_LIBS = $(top_builddir)/libtomboy/libtomboy.la
-endif
-
-LIBGNOTE_LIBS = $(LIBTOMBOY_LIBS)\
+LIBGNOTE_LIBS = \
        @LIBGLIBMM_LIBS@ @LIBGTKMM_LIBS@ \
        @LIBXSLT_LIBS@ \
        @GTKSPELL_LIBS@ @GTK_LIBS@ \