diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-12-07 18:17:29 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-12-18 11:19:56 -0500 |
| commit | 3c570b7ce99d1d9fe8d0d696176c8c0d6cd5b171 (patch) | |
| tree | 9bab5e573bd608016d0812b44cb4d4534e5beba4 | |
| parent | 41664ba237e073efe16d88e7ff6593677b6ce6c3 (diff) | |
| download | xorg-lib-libxkbcommon-3c570b7ce99d1d9fe8d0d696176c8c0d6cd5b171.tar.gz | |
config: relocate library functions check and comment
No functional changes.
Follow Automake suggested order.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 4221c09..c935870 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,10 @@ if test ! -f "src/xkbcomp/xkbparse.c"; then fi fi -dnl Build native compiler needed for makekeys +# 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 @@ -62,33 +65,36 @@ if test "x$CC_FOR_BUILD" = x; then fi fi -AC_CHECK_FUNCS([strcasecmp]) - if test "x$GCC" = xyes ; then CFLAGS="$CFLAGS -fvisibility=hidden" fi +# Obtain protocol headers include directives PKG_CHECK_MODULES([X11], [xproto kbproto >= 1.0.5]) -dnl Ensure we have keysym headers +# Obtain the path to the X Window System Core Protocol AC_MSG_CHECKING([for X11 includedir]) x11includedir="`$PKG_CONFIG --variable=includedir xproto`/X11" AC_MSG_RESULT([$x11includedir]) +# Obtain full path for keysymdef header file AC_MSG_CHECKING([for keysymdef.h]) KEYSYMDEF_H="$x11includedir/keysymdef.h" test -f "$KEYSYMDEF_H" || AC_MSG_ERROR([can't locate keysymdef.h in $x11includedir]) AC_MSG_RESULT([$KEYSYMDEF_H]) AC_SUBST([KEYSYMDEF_H]) +# Obtain full path for XF86keysym header file AC_MSG_CHECKING([for XF86keysym.h]) XF86KEYSYM_H="$x11includedir/XF86keysym.h" test -f "$XF86KEYSYM_H" || AC_MSG_ERROR([can't locate XF86keysym.h in $x11includedir]) AC_MSG_RESULT([$XF86KEYSYM_H]) AC_SUBST([XF86KEYSYM_H]) +# Aggregate the headers full paths for makekeys AC_SUBST([KS_HEADERS], ['$(KEYSYMDEF_H) $(XF86KEYSYM_H)']) +# Define a configuration option for the XKB config root AC_ARG_WITH([xkb_config_root], [AS_HELP_STRING([--with-xkb-config-root=<paths>], [Set default XKB config root (default: ${datadir}/X11/xkb)])], @@ -97,12 +103,11 @@ AC_ARG_WITH([xkb_config_root], AC_SUBST([XKBCONFIGROOT]) AC_CONFIG_FILES([ -Makefile -xkbcommon.pc -include/Makefile -src/Makefile -src/makekeys/Makefile -src/xkbcomp/Makefile -test/Makefile -]) + Makefile + xkbcommon.pc + include/Makefile + src/Makefile + src/makekeys/Makefile + src/xkbcomp/Makefile + test/Makefile]) AC_OUTPUT |