From c9c67387ce50a7499de8a90fa57bad5a5c3adb23 Mon Sep 17 00:00:00 2001
From: Anders Carlsson <andersca@gnu.org>
Date: Sun, 27 Oct 2002 15:15:27 +0000
Subject: [PATCH] Make XRandr detection work better.

2002-10-27  Anders Carlsson  <andersca@gnu.org>

	* configure.in: Make XRandr detection work better.
---
 ChangeLog    |  4 ++++
 configure.in | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5c515216..6b637944e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-27  Anders Carlsson  <andersca@gnu.org>
+
+	* configure.in: Make XRandr detection work better.
+
 2002-10-27  Havoc Pennington  <hp@pobox.com>
 
 	* src/window.c (meta_window_free): move
diff --git a/configure.in b/configure.in
index 879e12b4c..a1cb37aba 100644
--- a/configure.in
+++ b/configure.in
@@ -168,23 +168,23 @@ CPPFLAGS="$metacity_save_cppflags"
 SHAPE_LIBS=
 found_shape=no
 AC_CHECK_LIB(Xext, XShapeQueryExtension,
-               [AC_CHECK_HEADERS(X11/extensions/shape.h,
-                                 SHAPE_LIBS=-lXext found_shape=yes)],
+               [AC_CHECK_HEADER(X11/extensions/shape.h,
+                                SHAPE_LIBS=-lXext found_shape=yes)],
                , $ALL_X_LIBS)
 
-if test "$found_shape" = "no"; then
+if test "x$found_shape" = "xyes"; then
    AC_DEFINE(HAVE_SHAPE)
 fi
 
 RANDR_LIBS=
 found_randr=no
 AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
-               [AC_CHECK_HEADERS(X11/extensions/Xrandr.h,
-                                 RANDR_LIBS=-lXrandr, found_randr=yes,
-				 [#include <X11/Xlib.h>])],
+               [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
+                                RANDR_LIBS=-lXrandr found_randr=yes,,
+				[#include <X11/Xlib.h>])],
                , -lXrender $ALL_X_LIBS)
 
-if test "$found_randr" = "yes"; then
+if test "x$found_randr" = "xyes"; then
    AC_DEFINE(HAVE_RANDR)
 fi