Since every user building the library, even from git, doesn't need these files anymore, there's no need to check for them (this goes for makekeys as well).
The only remaining user is the update-keysyms target, but whoever will run it again (if ever) will probably know what he's doing (at least enough to run git diff before git commit). And the defaults should be fine too. Signed-off-by: Ran Benita <[email protected]> --- Makefile.am | 9 ++++++++- configure.ac | 23 ----------------------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7175aa1..f77d837 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,7 +90,7 @@ BUILT_SOURCES = \ src/ks_tables.h CLEANFILES = $(BUILT_SOURCES) -src/ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/makekeys/makekeys$(EXEEXT) +src/ks_tables.h: $(top_builddir)/makekeys/makekeys$(EXEEXT) $(AM_V_GEN)$(top_builddir)/makekeys/makekeys $(top_srcdir)/include/xkbcommon/xkbcommon-keysyms.h > $@ $(top_builddir)/makekeys/makekeys$(EXEEXT): $(top_srcdir)/makekeys/makekeys.c @@ -127,5 +127,12 @@ EXTRA_DIST = test/data # handle a duplicate definition in HPkeysyms.h which kicks in if it's # not already defined. +X11_INCLUDEDIR = /usr/include/X11 +KEYSYMDEFS = \ + $(X11_INCLUDEDIR)/keysymdef.h \ + $(X11_INCLUDEDIR)/XF86keysym.h \ + $(X11_INCLUDEDIR)/Sunkeysym.h \ + $(X11_INCLUDEDIR)/DECkeysym.h \ + $(X11_INCLUDEDIR)/HPkeysym.h update-keysyms: sed -e '/XK_Ydiaeresis\s*0x100000ee/d; /#define _/d; s/#define\s*\(\w*\)XK_/#define XKB_KEY_\1/; /\(#ifdef\|#ifndef\|#endif\)/d' $(KEYSYMDEFS) > include/xkbcommon/xkbcommon-keysyms.h diff --git a/configure.ac b/configure.ac index e69bdf1..fbbf8be 100644 --- a/configure.ac +++ b/configure.ac @@ -81,29 +81,6 @@ fi # Obtain protocols headers include directives PKG_CHECK_MODULES([X11], [xproto kbproto >= 1.0.4]) -# Obtain the path to the X Window System Core Protocol -AC_MSG_CHECKING([for X11 includedir]) -AC_ARG_VAR([X11_INCLUDEDIR], [Path to X protocol keysym headers]) -if test "x$X11_INCLUDEDIR" = x; then - X11_INCLUDEDIR="`$PKG_CONFIG --variable=includex11dir xproto`" -fi -if ! test -d "$X11_INCLUDEDIR"; then - AC_MSG_ERROR([invalid X11 include path $X11_INCLUDEDIR]) -fi -AC_MSG_RESULT([$X11_INCLUDEDIR]) - -AC_MSG_CHECKING([keysym definition files]) -FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" -for i in $FILES; do - if test -f "$X11_INCLUDEDIR/$i"; then - KEYSYMDEFS="$KEYSYMDEFS $X11_INCLUDEDIR/$i" - else - AC_MSG_ERROR([cannot find $i in $X11_INCLUDEDIR]) - fi -done -AC_MSG_RESULT([$KEYSYMDEFS]) -AC_SUBST(KEYSYMDEFS) - # Define a configuration option for the XKB config root xkb_base=`$PKG_CONFIG --variable=xkb_base xkeyboard-config` if test "x$xkb_base" = x; then -- 1.7.10.2 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
