From: Christoph Egger Subject: [PATCH] tools: fix x11 check Date: Wed, 24 Jun 2009 16:43:34 +0200 Message-ID: <200906241643.34453.Christoph.Egger@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_WujQKtlBs8imDCW" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --Boundary-00=_WujQKtlBs8imDCW Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi! 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 -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --Boundary-00=_WujQKtlBs8imDCW Content-Type: text/x-diff; charset="us-ascii"; name="xen_x11.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_x11.diff" diff -r f3a909c8e8e6 tools/check/check_x11_devel --- a/tools/check/check_x11_devel Wed Jun 24 15:24:53 2009 +0100 +++ b/tools/check/check_x11_devel Wed Jun 24 16:38:06 2009 +0200 @@ -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 f3a909c8e8e6 tools/check/funcs.sh --- a/tools/check/funcs.sh Wed Jun 24 15:24:53 2009 +0100 +++ b/tools/check/funcs.sh Wed Jun 24 16:38:06 2009 +0200 @@ -78,6 +78,11 @@ check_sys_root() { fi } +warning() { + echo + echo " *** `basename "$0"` FAILED${*+: $*}" +} + fail() { echo echo " *** `basename "$0"` FAILED${*+: $*}" --Boundary-00=_WujQKtlBs8imDCW Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_WujQKtlBs8imDCW--