Use AC_ARG_VAR for X11 header and XKB paths

[platform/upstream/libxkbcommon.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f4eefdc..04a737c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,14 +29,14 @@ AC_CONFIG_HEADERS([src/config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 # Initialize Automake
-AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects color-tests parallel-tests])
 AM_MAINTAINER_MODE
 
 # 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
 m4_ifndef([XORG_MACROS_VERSION],
@@ -72,7 +72,6 @@ if test "x$CC_FOR_BUILD" = x; then
     fi
 fi
 
-CFLAGS="$CFLAGS $BASE_CFLAGS"
 if test "x$GCC" = xyes ; then
     CFLAGS="$CFLAGS -fvisibility=hidden"
 fi
@@ -82,17 +81,22 @@ 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])
-includex11dir="`$PKG_CONFIG --variable=includex11dir xproto`"
-AC_MSG_RESULT([$includex11dir])
+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 definitions])
-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
+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 "$KEYSYMDEFDIR/$i"; then
-            KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i"
-    elif test "x$i" = "xkeysymdef.h"; then
-            AC_MSG_ERROR([Cannot find keysymdef.h])
+    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])
@@ -100,15 +104,15 @@ 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
+    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="$xkb_base"])
 AC_SUBST([XKBCONFIGROOT])
 
-AC_CONFIG_FILES([
-        Makefile
-        test/Makefile
-        xkbcommon.pc])
+AC_CONFIG_FILES([Makefile xkbcommon.pc])
 AC_OUTPUT