Skip to contentSkip to conversation

tools: fix x11 check

PATCH New Christoph Egger 1 participant 1 message Jun 24, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools: fix x11 check

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).

Signature · 6 lines
---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
tools/check/check_x11_devel +2 -1
diff -r f3a909c8e8e6 tools/check/check_x11_devel
@@ -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"
tools/check/funcs.sh +5 -0
diff -r f3a909c8e8e6 tools/check/funcs.sh
@@ -78,6 +78,11 @@ check_sys_root() {
 	fi
 }
 
+warning() {
+	echo
+	echo " *** `basename "$0"` FAILED${*+: $*}"
+}
+
 fail() {
 	echo
 	echo " *** `basename "$0"` FAILED${*+: $*}"

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel