Remove unneeded X11 dependency

https://bugzilla.gnome.org/show_bug.cgi?id=678036

diff --git a/atk-adaptor/Makefile.include b/atk-adaptor/Makefile.include
index 64099642a3f18dfa68d66dec9e6e0335f47aa990..e4079a7b071449228dfc1db259f1ac424f1ebfbb 100644 (file)
--- a/atk-adaptor/Makefile.include
+++ b/atk-adaptor/Makefile.include
@@ -7,8 +7,7 @@ libatk_bridge_la_CFLAGS = \
        -I$(top_srcdir)   \
        -I$(top_srcdir)/atk-adaptor/adaptors \
        -I$(top_srcdir)/atk-adaptor/
-       $(P2P_CFLAGS)     \
-       $(X_CFLAGS)
+       $(P2P_CFLAGS)
 
 libatk_bridge_la_LDFLAGS = -no-undefined  \
                           -module        \
@@ -19,7 +18,6 @@ libatk_bridge_la_LIBADD = $(DBUS_LIBS) \
                          $(GMODULE_LIBS)       \
                          $(ATK_LIBS)       \
                          $(ATSPI_LIBS)       \
-                         $(X_LIBS)         \
                          $(top_builddir)/droute/libdroute.la \
                          $(top_builddir)/atk-adaptor/adaptors/libatk-bridge-adaptors.la
 

diff --git a/atk-adaptor/adaptors/Makefile.am b/atk-adaptor/adaptors/Makefile.am
index 58663efacb04c74e924824f95e8733b95d92d9c1..66f7ba7013bb5616a0cd6256cfc48c92edb39eec 100644 (file)
--- a/atk-adaptor/adaptors/Makefile.am
+++ b/atk-adaptor/adaptors/Makefile.am
@@ -11,8 +11,7 @@ libatk_bridge_adaptors_la_CFLAGS =\
 libatk_bridge_adaptors_la_LIBADD =\
                          $(DBUS_LIBS) \
                          $(ATK_LIBS)       \
-                         $(ATSPI_LIBS)       \
-                         $(X_LIBS)
+                         $(ATSPI_LIBS)
 
 libatk_bridge_adaptors_la_SOURCES =\
        accessible-adaptor.c    \

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index a179ab8f21b6c7126ef6e3302ea502b410b6e6de..1ee9ba973ccf29bbc51c4915fb711331462cd487 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -25,8 +25,6 @@
 #define _GNU_SOURCE
 #include "config.h"
 
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/configure.ac b/configure.ac
index d93d3a5c00f257ffd76e2026741ca226413cf5f5..9e0f171af3bed7f895b199963478fb4f749ca1fa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -62,15 +62,6 @@ PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.1.4])
 AC_SUBST(ATSPI_LIBS)
 AC_SUBST(ATSPI_CFLAGS)
 
-AC_PATH_XTRA
-
-if test x$no_x = xyes ; then
-       AC_MSG_ERROR([X development libraries not found])
-else
-       X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-fi
-AC_SUBST(X_LIBS)
-
 GLIB_GSETTINGS
 
 AC_ARG_ENABLE(p2p, [  --enable-p2p  Allow peer-to-peer DBus connections [default=yes]], enable_p2p="$enableval", enable_p2p=yes)

diff --git a/tests/cspi/Makefile.am b/tests/cspi/Makefile.am
index f2e70a60f61abcd17eb2672a9ea848ca05ad899d..b5b8d05ab89e22b806d5d1d9b145d6e0068af8f0 100644 (file)
--- a/tests/cspi/Makefile.am
+++ b/tests/cspi/Makefile.am
@@ -16,4 +16,4 @@ INCLUDES = -I$(top_srcdir)           \
 
 LDADD = $(top_builddir)/common/libspicommon.la                         \
        $(top_builddir)/cspi/libcspi.la                         \
-       $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS) $(ATK_LIBS) $(GTK_LIBS) $(DBIND_LIBS) @EXTRA_SOCKET_LIBS@
+       $(TESTS_LIBS) $(XINPUT_LIBS) $(ATK_LIBS) $(GTK_LIBS) $(DBIND_LIBS) @EXTRA_SOCKET_LIBS@