diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-06 21:03:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-06 21:03:59 +0000 |
| commit | e2b908c356746281aba48128da7dc15a28f5a773 (patch) | |
| tree | 5f0a12dfa33c059d8fe09d9a5a792792f44189a6 /xorg-server/xkeyboard-config | |
| parent | 1fc1b7f67928082b9e922463be25c232d9bcba6a (diff) | |
| parent | 704e01fc69ebf6302aa1876906805147248abdaa (diff) | |
| download | vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.gz vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.bz2 vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config')
| -rw-r--r-- | xorg-server/xkeyboard-config/configure.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/configure.in b/xorg-server/xkeyboard-config/configure.in index 4306a61ef..d272aa1bc 100644 --- a/xorg-server/xkeyboard-config/configure.in +++ b/xorg-server/xkeyboard-config/configure.in @@ -37,7 +37,8 @@ AC_ARG_ENABLE( runtime-deps, if test "x$enable_runtime_deps" = "xyes"; then
PKG_CHECK_MODULES(DEPS, [xproto >= 7.0.20] [x11 >= 1.4.3], [have_deps=yes], [have_deps=no])
- AC_MSG_WARN([
+ if test "x$have_deps" = "xno" ; then
+ AC_MSG_WARN([
Required dependencies not found. These dependencies are
run-time dependencies only and not required for building.
Skip this check with --disable-runtime-deps.
@@ -47,7 +48,8 @@ if test "x$enable_runtime_deps" = "xyes"; then keyboard layouts.
])
- AC_MSG_ERROR([$DEPS_PKG_ERRORS])
+ AC_MSG_ERROR([$DEPS_PKG_ERRORS])
+ fi
fi
AM_CONDITIONAL(CREATE_RULES_SYMLINK, test "x$xkb_rules_symlink" != "x")
|