[gnome-desktop] [build] Really fix build without randr

[Vincent Untz <vuntz src gnome org>]

commit d175819881538f51a14072b1ef50f216a1de9332
Author: Vincent Untz <vuntz gnome org>
Date:   Tue Mar 9 12:53:17 2010 +0100

    [build] Really fix build without randr

 configure.in                        |    4 ++--
 libgnome-desktop/gnome-rr-config.c  |    7 ++++---
 libgnome-desktop/gnome-rr-private.h |    4 ++++
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/configure.in b/configure.in
index f3524f2..5c8770b 100644
--- a/configure.in
+++ b/configure.in
@@ -143,7 +143,7 @@ PKG_CHECK_MODULES(XLIB, x11,
      if test "x$no_x" = xyes; then
        AC_MSG_ERROR("no (requires X development libraries)")
      else
-       XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXrandr $X_EXTRA_LIBS"
+       XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
        XLIB_CFLAGS=$X_CFLAGS
      fi])
 AC_SUBST(X11_PACKAGE)
@@ -155,7 +155,7 @@ dnl Checks for X's RANDR extension
 if $PKG_CONFIG --atleast-version $XRANDR_REQUIRED xrandr; then
   echo "Building with the RANDR extension"
   AC_DEFINE(HAVE_RANDR, 1,
-            [Define if the xrandr-1.2 library is present])
+            [Define if the xrandr-$XRANDR_REQUIRED library is present])
   with_randr=yes
   RANDR_PACKAGE=xrandr
 else
diff --git a/libgnome-desktop/gnome-rr-config.c b/libgnome-desktop/gnome-rr-config.c
index 5568fe2..5702fc5 100644
--- a/libgnome-desktop/gnome-rr-config.c
+++ b/libgnome-desktop/gnome-rr-config.c
@@ -31,12 +31,13 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
+#include <X11/Xlib.h>
+#include <gdk/gdkx.h>
+
 #undef GNOME_DISABLE_DEPRECATED
 #include "libgnomeui/gnome-rr-config.h"
+
 #include "edid.h"
-#include <X11/Xlib.h>
-#include <X11/extensions/Xrandr.h>
-#include <gdk/gdkx.h>
 #include "gnome-rr-private.h"
 
 #define CONFIG_INTENDED_BASENAME "monitors.xml"
diff --git a/libgnome-desktop/gnome-rr-private.h b/libgnome-desktop/gnome-rr-private.h
index 285a745..0bc3b26 100644
--- a/libgnome-desktop/gnome-rr-private.h
+++ b/libgnome-desktop/gnome-rr-private.h
@@ -1,6 +1,10 @@
 #ifndef GNOME_RR_PRIVATE_H
 #define GNOME_RR_PRIVATE_H
 
+#ifdef HAVE_RANDR
+#include <X11/extensions/Xrandr.h>
+#endif
+
 typedef struct ScreenInfo ScreenInfo;
 
 struct ScreenInfo