ia64/xen-unstable

changeset 19834:edd603e77be4

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@amd.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Jun 25 12:59:46 2009 +0100 (2009-06-25)
parents f3a909c8e8e6
children edfdeb150f27
files tools/check/check_x11_devel tools/check/funcs.sh
line diff
     1.1 --- a/tools/check/check_x11_devel	Wed Jun 24 15:24:53 2009 +0100
     1.2 +++ b/tools/check/check_x11_devel	Thu Jun 25 12:59:46 2009 +0100
     1.3 @@ -5,4 +5,5 @@
     1.4  
     1.5  has_header X11/keysymdef.h || \
     1.6  has_header /usr/X11R6/include/X11/keysymdef.h || \
     1.7 -fail "can't find X11 headers"
     1.8 +has_header /usr/X11R7/include/X11/keysymdef.h || \
     1.9 +warning "can't find X11 headers"
     2.1 --- a/tools/check/funcs.sh	Wed Jun 24 15:24:53 2009 +0100
     2.2 +++ b/tools/check/funcs.sh	Thu Jun 25 12:59:46 2009 +0100
     2.3 @@ -78,6 +78,11 @@ check_sys_root() {
     2.4  	fi
     2.5  }
     2.6  
     2.7 +warning() {
     2.8 +	echo
     2.9 +	echo " *** `basename "$0"` FAILED${*+: $*}"
    2.10 +}
    2.11 +
    2.12  fail() {
    2.13  	echo
    2.14  	echo " *** `basename "$0"` FAILED${*+: $*}"