[gnome-control-center] bgo#554263 - Allow compiling without the RANDR libraries

[Federico Mena Quintero <federico src gnome org>]

commit 4b224e492750e639d2e3a906be3a8433c71cc0ac
Author: Federico Mena Quintero <federico novell com>
Date:   Mon Feb 22 21:01:16 2010 -0600

    bgo#554263 - Allow compiling without the RANDR libraries
    
    Signed-off-by: Federico Mena Quintero <federico novell com>

 capplets/Makefile.am |    5 +----
 configure.ac         |   17 +----------------
 2 files changed, 2 insertions(+), 20 deletions(-)
---
diff --git a/capplets/Makefile.am b/capplets/Makefile.am
index 728d882..004d00f 100644
--- a/capplets/Makefile.am
+++ b/capplets/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = \
 	accessibility	\
 	appearance		\
 	default-applications	\
+	display			\
 	keybindings		\
 	keyboard		\
 	mouse			\
@@ -23,10 +24,6 @@ DIST_SUBDIRS = \
 	about-me
 
 
-if HAVE_RANDR
-SUBDIRS += display
-endif
-
 if BUILD_ABOUTME
 SUBDIRS += about-me
 endif
diff --git a/configure.ac b/configure.ac
index 401cf4c..a6d41b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,23 +154,8 @@ PKG_CHECK_MODULES(FONT_VIEWER, $COMMON_MODULES $xft_modules)
 
 PKG_CHECK_MODULES(AT_CAPPLET, $COMMON_MODULES)
 
-dnl
-dnl Check for XRandR, needed for display capplet
-dnl
-
-have_randr=no
-AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
-  [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
-     have_randr=yes
-     RANDR_LIBS="-lXrandr -lXrender"
-     AC_DEFINE(HAVE_RANDR, 1, [Define if Xrandr extension is available]),
-	  :, [#include <X11/Xlib.h>])], : ,
-       -lXrandr -lXrender $x_libs)
-AM_CONDITIONAL(HAVE_RANDR, [test $have_randr = yes])
-
 PKG_CHECK_MODULES(DISPLAY_CAPPLET, $COMMON_MODULES)
-
-DISPLAY_CAPPLET_LIBS="$DISPLAY_CAPPLET_LIBS $RANDR_LIBS"
+DISPLAY_CAPPLET_LIBS="$DISPLAY_CAPPLET_LIBS"
 
 CAPPLET_LIBS="$CAPPLET_LIBS $x_libs"
 GNOMECC_LIBS="$GNOMECC_LIBS $x_libs"