summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey V. Udaltsov <svu@gnome.org>2011-04-05 23:24:34 +0100
committerSergey V. Udaltsov <svu@gnome.org>2011-04-05 23:33:21 +0100
commit764f32e0d779fcb7c367b442db76e515006d6a30 (patch)
tree79b28ae05df8554222030325bc47690f2f134650
parentee0654f28bfdbdc5fed3a0477c1d58a55d85127f (diff)
Fixed runtime deps checking
The condition was missing (cherry picked from commit 161cb4ffe01ea2bf8d94a4c3f5e21dc279dacf00)
-rw-r--r--configure.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 460138e..13911c3 100644
--- a/configure.in
+++ b/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")