diff options
| author | Federico Mena Quintero <federico@novell.com> | 2010-02-22 20:39:06 -0600 |
|---|---|---|
| committer | Federico Mena Quintero <federico@novell.com> | 2010-02-22 20:39:06 -0600 |
| commit | f0df8073a8dd7f5d57cb808e2de58f6f46a7d23a (patch) | |
| tree | d682379722964d588bdef99360135b08f45682e4 | |
| parent | a1fc969510ae6f91884976e2b899210977e38b14 (diff) | |
| download | gnome-settings-daemon-f0df8073a8dd7f5d57cb808e2de58f6f46a7d23a.tar.gz | |
bgo#554263 - Allow compiling without RANDR libraries
Signed-off-by: Federico Mena Quintero <federico@novell.com>
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | plugins/xrandr/Makefile.am | 3 | ||||
| -rw-r--r-- | plugins/xrandr/gsd-xrandr-manager.c | 4 |
3 files changed, 1 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 163fc6d6..b24ed5b2 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 d84eca1f..c5d660de 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 303c9051..e78eb6b1 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 |