[Xen-changelog] [xen-3.4-testing] tools: fix x11 check

["Xen patchbot-3.4-testing" <patchbot-3.4-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1246270153 -3600
# Node ID d27b58eaf26c6468c50be0c0618af176acaffd64
# Parent  ab4aea3199930862450cf10caf21ee5ebd836f81
tools: fix x11 check

X.org is installed in /usr/X11R7.
Attached patch covers this in the x11 check.
Xen has no direct X11 dependency
(it's inherited from SDL and SDL is optional for qemu-dm)
so warn but don't fail if no X11 is installed.
Fixes build problem on distributions which build their packages (*BSD
and Gentoo).

Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
xen-unstable changeset:   19834:edd603e77be4
xen-unstable date:        Thu Jun 25 12:59:46 2009 +0100
---
 tools/check/check_x11_devel |    3 ++-
 tools/check/funcs.sh        |    5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff -r ab4aea319993 -r d27b58eaf26c tools/check/check_x11_devel
--- a/tools/check/check_x11_devel       Mon Jun 29 11:08:32 2009 +0100
+++ b/tools/check/check_x11_devel       Mon Jun 29 11:09:13 2009 +0100
@@ -5,4 +5,5 @@
 
 has_header X11/keysymdef.h || \
 has_header /usr/X11R6/include/X11/keysymdef.h || \
-fail "can't find X11 headers"
+has_header /usr/X11R7/include/X11/keysymdef.h || \
+warning "can't find X11 headers"
diff -r ab4aea319993 -r d27b58eaf26c tools/check/funcs.sh
--- a/tools/check/funcs.sh      Mon Jun 29 11:08:32 2009 +0100
+++ b/tools/check/funcs.sh      Mon Jun 29 11:09:13 2009 +0100
@@ -78,6 +78,11 @@ check_sys_root() {
        fi
 }
 
+warning() {
+       echo
+       echo " *** `basename "$0"` FAILED${*+: $*}"
+}
+
 fail() {
        echo
        echo " *** `basename "$0"` FAILED${*+: $*}"

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog