[totem] build: We don't need XTest anymore
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] build: We don't need XTest anymore
- Date: Thu, 29 Mar 2012 02:19:38 +0000 (UTC)
commit 8d95c56a3cfc3e1ef3d9b4ae1fbe699b8908148d
Author: Bastien Nocera <hadess hadess net>
Date: Thu Mar 29 03:50:03 2012 +0200
build: We don't need XTest anymore
As the code using it (screensaver inhibit) has been replaced.
Helps with:
https://bugzilla.gnome.org/show_bug.cgi?id=672735
browser-plugin/Makefile.am | 1 -
configure.in | 17 -----------------
src/backend/Makefile.am | 3 +--
3 files changed, 1 insertions(+), 20 deletions(-)
---
diff --git a/browser-plugin/Makefile.am b/browser-plugin/Makefile.am
index 9bfe326..2ba8167 100644
--- a/browser-plugin/Makefile.am
+++ b/browser-plugin/Makefile.am
@@ -110,7 +110,6 @@ totem_plugin_viewer_LDADD = \
$(DEPENDENCY_LIBS) \
$(SN_LIBS) \
$(DBUS_LIBS) \
- $(XTEST_LIBS) \
$(X_LIBS)
totem-plugin-viewer-interface.h: org_gnome_totem_PluginViewer.xml
diff --git a/configure.in b/configure.in
index 7957d7b..1cde398 100644
--- a/configure.in
+++ b/configure.in
@@ -270,18 +270,6 @@ for gdk_target in $gdk_targets; do
CFLAGS="$X_INCLUDES $CFLAGS"
LIBS="$X_LIBRARIES $LIBS"
- XTEST_LIBS=""
- enable_xtest=no
- AC_CHECK_LIB(Xtst, XTestFakeKeyEvent,
- XTEST_LIBS="-lX11 -lXtst $X_LIBRARIES"
- enable_xtest=yes
- AC_DEFINE(HAVE_XTEST, 1, [defined if you have XTest library]),
- ,
- $X_LIBRARIES)
- AC_SUBST(XTEST_LIBS)
-
- X_LIBS=""
-
dnl Explicitely link against libX11 to avoid problems with crappy linkers
X_LIBS="$X_LIBRARIES -lX11"
AC_SUBST(X_LIBS)
@@ -876,11 +864,6 @@ if test x$ENABLE_NAUTILUS = xyes ; then
else
AC_MSG_NOTICE([ Nautilus properties page disabled])
fi
-if test x$enable_xtest = xyes ; then
- AC_MSG_NOTICE([** XTest (legacy screensaver) support enabled])
-else
- AC_MSG_NOTICE([ XTest (legacy screensaver) support disabled])
-fi
if test x$have_xfree = xyes ; then
AC_MSG_NOTICE([** XFree86 multimedia keys support enabled])
else
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index f4c1ec0..ef9fcf3 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -17,8 +17,7 @@ bvw_test_CFLAGS = \
bvw_test_LDADD = \
libbaconvideowidget.la \
- $(DEPENDENCY_LIBS) \
- $(XTEST_LIBS)
+ $(DEPENDENCY_LIBS)
# Marshallers
BVW_MARSHAL_FILES = baconvideowidget-marshal.c baconvideowidget-marshal.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]