dnl Process this file with autoconf to create configure.
# Initialize Autoconf
-AC_PREREQ([2.60])
-AC_INIT([libxkbcommon], [0.1.0],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_PREREQ([2.62])
+AC_INIT([libxkbcommon], [0.3.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=libxkbcommon],
+ [libxkbcommon], [http://xkbcommon.org])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h])
AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
# Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip subdir-objects color-tests parallel-tests])
+AM_MAINTAINER_MODE([enable])
+
+# Get _GNU_SOURCE and friends
+AC_USE_SYSTEM_EXTENSIONS
# Initialize libtool
-AC_PROG_LIBTOOL
+LT_INIT
-# Require xorg-macros minimum of 1.8 for AM_SILENT_RULES
+# Add xorg-macros stuff
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.8)
+ [m4_fatal([must install xorg-macros 1.16 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.16)
XORG_DEFAULT_OPTIONS
-XORG_CHECK_MALLOC_ZERO
+XORG_MEMORY_CHECK_FLAGS
+XORG_ENABLE_DOCS
+XORG_WITH_DOXYGEN
+
+# Check for compiler features
+AC_C_INLINE
# Check for programs
-AC_PROG_LEX
+AC_PROG_MKDIR_P
+PKG_PROG_PKG_CONFIG
+
+# Note: we use some yacc extensions, which work with either GNU bison
+# (preferred) or byacc. Other yacc's may or may not work.
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
# Checks for library functions.
-AC_CHECK_FUNCS([strcasecmp])
-
-# 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
- if test "$cross_compiling" != no; then
- AC_PATH_PROGS([CC_FOR_BUILD], [gcc cc], [cc])
- else
- CC_FOR_BUILD="$CC"
- fi
+AC_CHECK_FUNCS([strcasecmp strncasecmp])
+if test "x$ac_cv_func_strcasecmp" = xno || \
+ test "x$ac_cv_func_strncasecmp" = xno; then
+ AC_MSG_ERROR([C library does not support strcasecmp/strncasecmp])
fi
-# 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])
-includex11dir="`$PKG_CONFIG --variable=includex11dir xproto`"
-AC_MSG_RESULT([$includex11dir])
+AC_CHECK_FUNCS([eaccess euidaccess mmap])
-# Obtain full path for keysymdef header file
-AC_MSG_CHECKING([for keysymdef.h])
-KEYSYMDEF_H="$includex11dir/keysymdef.h"
-test -f "$KEYSYMDEF_H" || AC_MSG_ERROR([can't locate keysymdef.h in $includex11dir])
-AC_MSG_RESULT([$KEYSYMDEF_H])
-AC_SUBST([KEYSYMDEF_H])
+# Some tests use Linux-specific headers
+AC_CHECK_HEADER([linux/input.h])
+AM_CONDITIONAL(BUILD_LINUX_TESTS, [test "x$ac_cv_header_linux_input_h" = xyes])
-# Obtain full path for XF86keysym header file
-AC_MSG_CHECKING([for XF86keysym.h])
-XF86KEYSYM_H="$includex11dir/XF86keysym.h"
-test -f "$XF86KEYSYM_H" || AC_MSG_ERROR([can't locate XF86keysym.h in $includex11dir])
-AC_MSG_RESULT([$XF86KEYSYM_H])
-AC_SUBST([XF86KEYSYM_H])
-
-# Aggregate the headers full paths for makekeys
-AC_SUBST([KS_HEADERS], ['$(KEYSYMDEF_H) $(XF86KEYSYM_H)'])
+XORG_TESTSET_CFLAG([BASE_CFLAGS], [-fvisibility=hidden])
# 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
+ xkb_base=$datadir/X11/xkb
+fi
AC_ARG_WITH([xkb_config_root],
- [AS_HELP_STRING([--with-xkb-config-root=<paths>],
- [Set default XKB config root (default: ${datadir}/X11/xkb)])],
+ [AS_HELP_STRING([--with-xkb-config-root=<path>],
+ [Set default XKB config root (default: xkeyboard-config install path)])],
[XKBCONFIGROOT="$withval"],
- [XKBCONFIGROOT='${datadir}/X11/xkb'])
+ [XKBCONFIGROOT="$xkb_base"])
AC_SUBST([XKBCONFIGROOT])
+AC_ARG_WITH([default_rules],
+ [AS_HELP_STRING([--with-default-rules=<path>],
+ [Default XKB ruleset (default: evdev)])],
+ [DEFAULT_XKB_RULES="$withval"],
+ [DEFAULT_XKB_RULES="evdev"])
+AC_DEFINE_UNQUOTED([DEFAULT_XKB_RULES], ["$DEFAULT_XKB_RULES"],
+ [Default XKB ruleset])
+
+AC_ARG_WITH([default_model],
+ [AS_HELP_STRING([--with-default-model=<path>],
+ [Default XKB model (default: pc105)])],
+ [DEFAULT_XKB_MODEL="$withval"],
+ [DEFAULT_XKB_MODEL="pc105"])
+AC_DEFINE_UNQUOTED([DEFAULT_XKB_MODEL], ["$DEFAULT_XKB_MODEL"],
+ [Default XKB model])
+
+AC_ARG_WITH([default_layout],
+ [AS_HELP_STRING([--with-default-layout=<path>],
+ [Default XKB layout (default: us)])],
+ [DEFAULT_XKB_LAYOUT="$withval"],
+ [DEFAULT_XKB_LAYOUT="us"])
+AC_DEFINE_UNQUOTED([DEFAULT_XKB_LAYOUT], ["$DEFAULT_XKB_LAYOUT"],
+ [Default XKB layout])
+
+AC_ARG_WITH([default_variant],
+ [AS_HELP_STRING([--with-default-variant=<path>],
+ [Default XKB variant (default: (none))])],
+ [DEFAULT_XKB_VARIANT="$withval"],
+ [DEFAULT_XKB_VARAINT=])
+if ! test "x$DEFAULT_XKB_VARIANT" = x; then
+ AC_DEFINE_UNQUOTED([DEFAULT_XKB_VARIANT], ["$DEFAULT_XKB_VARIANT"],
+ [Default XKB variant])
+fi
+
+AC_ARG_WITH([default_options],
+ [AS_HELP_STRING([--with-default-options=<path>],
+ [Default XKB options (default: (none))])],
+ [DEFAULT_XKB_OPTIONS="$withval"],
+ [DEFAULT_XKB_OPTIONS=])
+if ! test "x$DEFAULT_XKB_OPTIONS" = x; then
+ AC_DEFINE_UNQUOTED([DEFAULT_XKB_OPTIONS], ["$DEFAULT_XKB_OPTIONS"],
+ [Default XKB options])
+fi
+
AC_CONFIG_FILES([
- Makefile
- xkbcommon.pc
- include/Makefile
- src/Makefile
- src/makekeys/Makefile
- src/xkbcomp/Makefile
- test/Makefile])
+ Makefile
+ xkbcommon-uninstalled.pc
+ xkbcommon.pc
+ doc/Doxyfile
+])
AC_OUTPUT