From f07585ca27a8487bc66dfe41486c823f0fdcea7d Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sat, 15 Mar 2008 17:32:57 +0200
Subject: [PATCH] configure.ac: Don't search for legacy X11 headers

This can actually break cross-compiles, so don't do it anymore.
---
 configure.ac | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1567a560..20186246 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,31 +220,14 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
 #
 # Find keysymdef.h
 #
-KEYSYMDEF=""
 AC_MSG_CHECKING([keysymdef.h])
-for flag in $XPROTO_CFLAGS -I/usr/include; do
-	case "$KEYSYMDEF" in
-	"")
-		case "$flag" in
-		*-I*)
-			dir=`echo "$flag" | sed 's/ *-I//'`
-			file="$dir/X11/keysymdef.h"
-			if test -f "$file"; then
-				KEYSYMDEF="$file"
-			fi
-			;;
-		esac
-		;;
-	esac
-done
-case "$KEYSYMDEF" in
-"")
+_dir=`pkg-config --variable=includedir xproto`
+KEYSYMDEF="$dir/X11/keysymdef.h"
+if test -f "$KEYSYMDEF"; then
+        AC_MSG_RESULT([$KEYSYMDEF])
+else
 	AC_MSG_ERROR([Cannot find keysymdef.h])
-	;;
-*)
-	AC_MSG_RESULT([$KEYSYMDEF])
-        ;;
-esac
+fi
 AC_SUBST(KEYSYMDEF)
 
 AM_CONDITIONAL(UDC, test xfalse = xtrue)