From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 00:29:01 +0000 (+0200)
Subject: Disable kfreebsd bootcheck on qemu and multiboot
X-Git-Tag: 1.99~629^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=303f59958e9cb23056e8f35dc4263dc08e522d36;p=thirdparty%2Fgrub.git

Disable kfreebsd bootcheck on qemu and multiboot
---

diff --git a/Makefile.am b/Makefile.am
index fc3d273f2..1cf2297bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -272,12 +272,16 @@ endif
 
 if !COND_i386_coreboot
 # Crashes because memory at 0-0x1000 is occupied
-BOOTCHECKS += bootcheck-kfreebsd-x86_64
-# Likewise.
 BOOTCHECKS += bootcheck-knetbsd-x86_64
 
+# Likewise and require ACPI.
+if !COND_i386_multiboot
+if !COND_i386_qemu
+BOOTCHECKS += bootcheck-kfreebsd-x86_64
 BOOTCHECKS += bootcheck-kfreebsd-i386
 endif
+endif
+endif
 
 BOOTCHECKS += bootcheck-kfreebsd-aout