diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index bfdec28..10a64f4 100644 --- a/configure.ac +++ b/configure.ac @@ -22,8 +22,9 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.62]) -AC_INIT([libxkbcommon], [0.2.0], - [https://bugs.freedesktop.org/enter_bug.cgi?product=libxkbcommon]) +AC_INIT([libxkbcommon], [0.3.0], + [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]) @@ -38,9 +39,9 @@ AC_USE_SYSTEM_EXTENSIONS # Initialize 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])]) + [m4_fatal([must install xorg-macros 1.16 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.16) XORG_DEFAULT_OPTIONS XORG_MEMORY_CHECK_FLAGS @@ -49,7 +50,6 @@ XORG_WITH_DOXYGEN # Check for compiler features AC_C_INLINE -AC_C_TYPEOF # Check for programs AC_PROG_MKDIR_P @@ -72,6 +72,10 @@ fi AC_CHECK_FUNCS([eaccess euidaccess]) +# 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]) + XORG_TESTSET_CFLAG([BASE_CFLAGS], [-fvisibility=hidden]) # Define a configuration option for the XKB config root @@ -110,6 +114,26 @@ AC_ARG_WITH([default_layout], 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-uninstalled.pc |