From patchwork Tue Jan 12 21:21:27 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Kiszka <jan.kiszka@web.de>
X-Patchwork-Id: 72445
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0CLLVVQ012918
	for <patchwork-kvm@patchwork.kernel.org>;
	Tue, 12 Jan 2010 21:21:32 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752358Ab0ALVVa (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Tue, 12 Jan 2010 16:21:30 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752784Ab0ALVVa
	(ORCPT <rfc822;kvm-outgoing>); Tue, 12 Jan 2010 16:21:30 -0500
Received: from fmmailgate02.web.de ([217.72.192.227]:35420 "EHLO
	fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752219Ab0ALVV3 (ORCPT <rfc822; kvm@vger.kernel.org>);
	Tue, 12 Jan 2010 16:21:29 -0500
Received: from smtp07.web.de (fmsmtp07.dlan.cinetic.de [172.20.5.215])
	by fmmailgate02.web.de (Postfix) with ESMTP id 112AC14BCF8DF;
	Tue, 12 Jan 2010 22:21:28 +0100 (CET)
Received: from [88.65.253.164] (helo=[192.168.1.10])
	by smtp07.web.de with asmtp (TLSv1:AES256-SHA:256)
	(WEB.DE 4.110 #314)
	id 1NUoB5-0001VT-00; Tue, 12 Jan 2010 22:21:27 +0100
Message-ID: <4B4CE7D7.9060500@web.de>
Date: Tue, 12 Jan 2010 22:21:27 +0100
From: Jan Kiszka <jan.kiszka@web.de>
User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de;
	rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1
	Thunderbird/2.0.0.12 Mnenhy/0.7.5.666
MIME-Version: 1.0
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
CC: Gleb Natapov <gleb@redhat.com>, kvm <kvm@vger.kernel.org>
Subject: [PATCH 1/2] qemu-kvm: Use kvm-kmod headers if available
X-Enigmail-Version: 0.95.7
X-Sender: jan.kiszka@web.de
X-Provags-ID: V01U2FsdGVkX18/ZDexIEJtTwcEvarT8ejogU6ZfYZslnL0eGx8
	49vbTm9EpW7hqBLSnzn0ITWk9nZ1ZebfzErzOw8fxOHr+lHZsQ ycMEQaIV8=
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org


diff --git a/configure b/configure
index 20c374a..6ba565a 100755
--- a/configure
+++ b/configure
@@ -1424,6 +1424,8 @@ EOF
             kvm_cflags="$kvm_cflags -I$kerneldir/arch/$cpu/include"
       fi
   else
+    kvm_cflags=`pkg-config --cflags kvm-kmod 2> /dev/null`
+    if test "$kvm_cflags" = ""; then
       case "$cpu" in
       i386 | x86_64)
         kvm_arch="x86"
@@ -1438,6 +1440,7 @@ EOF
       kvm_cflags="-I$source_path/kvm/include"
       kvm_cflags="$kvm_cflags -include $source_path/kvm/include/linux/config.h"
       kvm_cflags="$kvm_cflags -I$source_path/kvm/include/$kvm_arch"
+    fi
   fi
   kvm_cflags="$kvm_cflags -idirafter $source_path/compat"
   if compile_prog "$kvm_cflags" "" ; then