diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2010-06-15 18:48:48 +0100 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2010-07-08 16:30:54 +0100 |
| commit | 00175397480b76d32bf82b0c7c94c91a2a95954e (patch) | |
| tree | 4dfe41d3a08c2b41ea07d5fa1704ad727c4f3350 /configure.ac | |
| parent | ebd6ef0a4db0ddef0ae17ad14571518ccdeea5ba (diff) | |
makekeys: Scan vendor keysyms as well as core
Since we can't really live without vendor keysyms, scan them all in to
generate ks_tables.h, rather than only doing the core ones, and leaving
the vendor syms to be manually synchronised with XKeysymDB.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 7a10fe27..577f581c 100644 --- a/configure.ac +++ b/configure.ac @@ -313,15 +313,18 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) # # Find keysymdef.h # -AC_MSG_CHECKING([keysymdef.h]) -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]) -fi -AC_SUBST(KEYSYMDEF) +AC_MSG_CHECKING([keysym definitions]) +KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 +FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" +for i in $FILES; do + if test -f "$KEYSYMDEFDIR/$i"; then + KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i" + elif test "x$i" = "xkeysymdef.h"; then + AC_MSG_ERROR([Cannot find keysymdef.h]) + fi +done +AC_MSG_RESULT([$KEYSYMDEFS]) +AC_SUBST(KEYSYMDEFS) AM_CONDITIONAL(UDC, test xfalse = xtrue) |