X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=9f5afa03ace5499d5b0c4f97369817c593900ba1;hb=eb34825560edf570d883d3e52a8fe657c17b3d9c;hp=b2d247097a71647515de5eeda6235aa662e79e52;hpb=a86fa17aebf40041a75b0548b81b36fdd6eeb770;p=platform%2Fupstream%2Flibxkbcommon.git

diff --git a/configure.ac b/configure.ac
index b2d2470..9f5afa0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,14 +22,16 @@ dnl Process this file with autoconf to create configure.
 
 # Initialize Autoconf
 AC_PREREQ([2.62])
-AC_INIT([libxkbcommon], [0.1.0],
-    [https://bugs.freedesktop.org/enter_bug.cgi?product=libxkbcommon])
+AC_INIT([libxkbcommon], [0.3.2],
+        [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 subdir-objects color-tests parallel-tests])
+AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip subdir-objects color-tests parallel-tests check-news])
 AM_MAINTAINER_MODE([enable])
 
 # Get _GNU_SOURCE and friends
@@ -38,22 +40,27 @@ 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])])
-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_MEMORY_CHECK_FLAGS
 XORG_ENABLE_DOCS
 XORG_WITH_DOXYGEN
 
+# Needed in older Automakes for subdir-objects
+AM_PROG_CC_C_O
+
 # Check for compiler features
 AC_C_INLINE
-AC_C_TYPEOF
 
 # Check for programs
 AC_PROG_MKDIR_P
-AC_PROG_LEX
+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/parser.c"; then
@@ -69,19 +76,16 @@ if test "x$ac_cv_func_strcasecmp" = xno || \
     AC_MSG_ERROR([C library does not support strcasecmp/strncasecmp])
 fi
 
-AC_CHECK_FUNCS([eaccess euidaccess])
+AC_CHECK_FUNCS([eaccess euidaccess mmap])
 
-# 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
-fi
+# 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([CFLAGS], [-fvisibility=hidden])
+XORG_TESTSET_CFLAG([BASE_CFLAGS], [-fvisibility=hidden])
+
+XORG_CHECK_LINKER_FLAGS([-Wl,--no-undefined], [have_no_undefined=yes])
+AM_CONDITIONAL([HAVE_NO_UNDEFINED], [test "x$have_no_undefined" = xyes])
 
 # Define a configuration option for the XKB config root
 xkb_base=`$PKG_CONFIG --variable=xkb_base xkeyboard-config`
@@ -119,11 +123,43 @@ 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_ARG_ENABLE([x11],
+    [AS_HELP_STRING([--disable-x11],
+        [Disable support for creating keymaps with the X11 protocol (default: enabled)])],
+    [], [enable_x11=yes])
+if test "x$enable_x11" == xyes; then
+    PKG_CHECK_MODULES([XCB_XKB], [xcb xcb-xkb >= 1.10], [],
+        [AC_MSG_ERROR([xkbcommon-x11 requires xcb-xkb >= 1.10 which was not found. \
+You can disable X11 support with --disable-x11.])])
+fi
+AM_CONDITIONAL([ENABLE_X11], [test "x$enable_x11" == xyes])
+
 AC_CONFIG_FILES([
     Makefile
-    makekeys/Makefile
     xkbcommon-uninstalled.pc
     xkbcommon.pc
+    xkbcommon-x11.pc
+    xkbcommon-x11-uninstalled.pc
     doc/Doxyfile
 ])
 AC_OUTPUT