diff options
| author | Bastien Nocera <hadess@hadess.net> | 2012-06-13 16:29:22 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2012-06-14 18:02:43 +0100 |
| commit | ffd010474d49259d95b81bdfa5550ddb95a23f35 (patch) | |
| tree | d8f4dfdfc0f0980e40e5513dd389e6348d46a262 | |
| parent | ed83098eebf77cb108b9471342cc3a172d8d258f (diff) | |
| download | at-spi2-atk-ffd010474d49259d95b81bdfa5550ddb95a23f35.tar.gz | |
Remove unneeded X11 dependency
https://bugzilla.gnome.org/show_bug.cgi?id=678036
| -rw-r--r-- | atk-adaptor/Makefile.include | 4 | ||||
| -rw-r--r-- | atk-adaptor/adaptors/Makefile.am | 3 | ||||
| -rw-r--r-- | atk-adaptor/bridge.c | 2 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | tests/cspi/Makefile.am | 2 |
5 files changed, 3 insertions, 17 deletions
diff --git a/atk-adaptor/Makefile.include b/atk-adaptor/Makefile.include index 6409964..e4079a7 100644 --- 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 58663ef..66f7ba7 100644 --- 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 a179ab8..1ee9ba9 100644 --- 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 d93d3a5..9e0f171 100644 --- 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 f2e70a6..b5b8d05 100644 --- 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@ |