This simplifies working with new features without having to update the
locally mirrored headers. It also reduces the diff to upstream.
Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
---
configure | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/configure b/configure
index 8866258..3a4318c 100755
--- a/configure
+++ b/configure
@@ -1346,23 +1346,7 @@ fi
##########################################
# kvm probe
if test "$kvm" != "no" ; then
- case "$cpu" in
- i386 | x86_64)
- kvm_arch="x86"
- ;;
- ppc)
- kvm_arch="powerpc"
- ;;
- *)
- kvm_arch="$cpu"
- ;;
- esac
-
- kvm_cflags="-I$source_path/kvm/include"
- kvm_cflags="$kvm_cflags -I$source_path/kvm/include/$kvm_arch"
- kvm_cflags="$kvm_cflags -idirafter $source_path/compat"
-
- cat > $TMPC <<EOF
+ cat > $TMPC <<EOF
#include <linux/kvm.h>
#if !defined(KVM_API_VERSION) || KVM_API_VERSION < 12 || KVM_API_VERSION > 12
#error Invalid KVM version
@@ -1378,6 +1362,32 @@ if test "$kvm" != "no" ; then
#endif
int main(void) { return 0; }
EOF
+ if test "$kerneldir" != "" ; then
+ kvm_cflags=-I"$kerneldir"/include
+ if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) \
+ -a -d "$kerneldir/arch/x86/include" ; then
+ kvm_cflags="$kvm_cflags -I$kerneldir/arch/x86/include"
+ elif test "$cpu" = "ppc" -a -d "$kerneldir/arch/powerpc/include" ; then
+ kvm_cflags="$kvm_cflags -I$kerneldir/arch/powerpc/include"
+ elif test -d "$kerneldir/arch/$cpu/include" ; then
+ kvm_cflags="$kvm_cflags -I$kerneldir/arch/$cpu/include"
+ fi
+ else
+ case "$cpu" in
+ i386 | x86_64)
+ kvm_arch="x86"
+ ;;
+ ppc)
+ kvm_arch="powerpc"
+ ;;
+ *)
+ kvm_arch="$cpu"
+ ;;
+ esac
+ kvm_cflags="-I$source_path/kvm/include"
+ kvm_cflags="$kvm_cflags -I$source_path/kvm/include/$kvm_arch"
+ fi
+ kvm_cflags="$kvm_cflags -idirafter $source_path/compat"
if compile_prog "$kvm_cflags" "" ; then
kvm=yes
else
Attachment:
signature.asc
Description: OpenPGP digital signature
