[gnome-settings-daemon] bgo#554263 - Allow compiling without RANDR libraries
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] bgo#554263 - Allow compiling without RANDR libraries
- Date: Tue, 23 Feb 2010 02:37:50 +0000 (UTC)
commit f0df8073a8dd7f5d57cb808e2de58f6f46a7d23a
Author: Federico Mena Quintero <federico novell com>
Date: Mon Feb 22 20:39:06 2010 -0600
bgo#554263 - Allow compiling without RANDR libraries
Signed-off-by: Federico Mena Quintero <federico novell com>
configure.ac | 13 -------------
plugins/xrandr/Makefile.am | 3 +--
plugins/xrandr/gsd-xrandr-manager.c | 4 ----
3 files changed, 1 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 163fc6d..b24ed5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,19 +186,6 @@ AM_CONDITIONAL(HAVE_XINPUT, [test $have_xinput = yes])
AC_SUBST(XINPUT_LIBS)
dnl ---------------------------------------------------------------------------
-dnl - XRandR
-dnl ---------------------------------------------------------------------------
-
-have_randr=no
-AC_CHECK_X_LIB(Xrandr, XRRUpdateConfiguration,
- [AC_CHECK_X_HEADERS(X11/extensions/Xrandr.h,
- have_randr=yes
- RANDR_LIBS="-lXrandr -lXrender",
- :, [#include <X11/Xlib.h>])], : ,
- -lXrandr -lXrender $x_libs)
-AC_SUBST(RANDR_LIBS)
-
-dnl ---------------------------------------------------------------------------
dnl - Fontconfig
dnl ---------------------------------------------------------------------------
diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am
index d84eca1..c5d660d 100644
--- a/plugins/xrandr/Makefile.am
+++ b/plugins/xrandr/Makefile.am
@@ -61,8 +61,7 @@ libxrandr_la_LDFLAGS = \
libxrandr_la_LIBADD = \
$(SETTINGS_PLUGIN_LIBS) \
- $(LIBNOTIFY_LIBS) \
- $(RANDR_LIBS)
+ $(LIBNOTIFY_LIBS)
plugin_in_files = \
xrandr.gnome-settings-plugin.in
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 303c905..e78eb6b 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -45,10 +45,6 @@
#include <libgnomeui/gnome-rr.h>
#include <libgnomeui/gnome-rr-labeler.h>
-#ifdef HAVE_X11_EXTENSIONS_XRANDR_H
-#include <X11/extensions/Xrandr.h>
-#endif
-
#ifdef HAVE_LIBNOTIFY
#include <libnotify/notify.h>
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]