XORG_DEFAULT_OPTIONS
XORG_CHECK_MALLOC_ZERO
+# Check for compiler features
+AC_C_INLINE
+AC_C_TYPEOF
+
# Check for programs
AC_PROG_LEX
AC_PROG_YACC
AC_PATH_PROG([YACC_INST], $YACC)
-if test ! -f "src/xkbcomp/xkbparse.c"; then
+if test ! -f "src/xkbcomp/parser.c"; then
if test -z "$YACC_INST"; then
- AC_MSG_ERROR([yacc not found - unable to compile src/xkbcomp/xkbparse.y])
+ AC_MSG_ERROR([yacc not found - unable to compile src/xkbcomp/parser.y])
fi
fi
AC_MSG_ERROR([C library does not support strcasecmp/strncasecmp])
fi
+AC_CHECK_FUNCS([eaccess euidaccess])
+
# Build native compiler needed for makekeys
AC_ARG_VAR([CC_FOR_BUILD], [Build native C compiler program])
if test "x$CC_FOR_BUILD" = x; then
# 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
AC_CONFIG_FILES([
Makefile
makekeys/Makefile
+ xkbcommon-uninstalled.pc
xkbcommon.pc])
AC_OUTPUT