From b08ba56019b146786e1cde553c036dd0c4fd02e5 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 14 Sep 2012 11:09:08 +0200
Subject: fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012

---
 libX11/configure.ac | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'libX11')

diff --git a/libX11/configure.ac b/libX11/configure.ac
index 48a0c8ab9..a45f9d956 100644
--- a/libX11/configure.ac
+++ b/libX11/configure.ac
@@ -306,7 +306,15 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
 # Find keysymdef.h
 #
 AC_MSG_CHECKING([keysym definitions])
-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
+AC_ARG_WITH([keysymdefdir],
+        [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])],
+        [KEYSYMDEFDIR=$withval],
+        [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11])
+
+if test ! -d "$KEYSYMDEFDIR"; then
+	AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory])
+fi
+
 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
 for i in $FILES; do
     if test -f "$KEYSYMDEFDIR/$i"; then
-- 
cgit v1.2.3