[PATCH libxkbcommon 02/11] config: use xproto pkgconfig includex11dir variable

Gaetan Nadon memsize at videotron.ca
Sat Dec 11 17:08:31 PST 2010

Rather than appending X11 to the include dir.
It should be safe to use as it has been added in 2005.

Use a local variable name matching the pkgconfig name.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
 configure.ac |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index c935870..4fa9ea7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,25 +69,25 @@ if  test "x$GCC" = xyes ; then
   CFLAGS="$CFLAGS -fvisibility=hidden"
-# Obtain protocol headers include directives
+# Obtain protocols headers include directives
 PKG_CHECK_MODULES([X11], [xproto kbproto >= 1.0.5])
 # Obtain the path to the X Window System Core Protocol
 AC_MSG_CHECKING([for X11 includedir])
-x11includedir="`$PKG_CONFIG --variable=includedir xproto`/X11"
+includex11dir="`$PKG_CONFIG --variable=includex11dir xproto`"
 # Obtain full path for keysymdef header file
 AC_MSG_CHECKING([for keysymdef.h])
-test -f "$KEYSYMDEF_H" || AC_MSG_ERROR([can't locate keysymdef.h in $x11includedir])
+test -f "$KEYSYMDEF_H" || AC_MSG_ERROR([can't locate keysymdef.h in $includex11dir])
 # Obtain full path for XF86keysym header file
 AC_MSG_CHECKING([for XF86keysym.h])
-test -f "$XF86KEYSYM_H" || AC_MSG_ERROR([can't locate XF86keysym.h in $x11includedir])
+test -f "$XF86KEYSYM_H" || AC_MSG_ERROR([can't locate XF86keysym.h in $includex11dir])

More information about the xorg-devel mailing list