From patchwork Tue Mar 5 17:05:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 225093 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 34AEF2C0328 for ; Wed, 6 Mar 2013 04:07:37 +1100 (EST) Received: from localhost ([::1]:37181 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCvKx-0007vW-A9 for incoming@patchwork.ozlabs.org; Tue, 05 Mar 2013 12:07:35 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCvJC-0005dX-JA for qemu-devel@nongnu.org; Tue, 05 Mar 2013 12:05:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UCvJ8-0008SG-5N for qemu-devel@nongnu.org; Tue, 05 Mar 2013 12:05:46 -0500 Received: from mail-qa0-f50.google.com ([209.85.216.50]:45076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCvJ8-0008S1-1J; Tue, 05 Mar 2013 12:05:42 -0500 Received: by mail-qa0-f50.google.com with SMTP id dx4so2037210qab.9 for ; Tue, 05 Mar 2013 09:05:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=tCbhn40LgrDgiHBy6l5psLApGKMGGWDZ4d3+2IwamO8=; b=k6+3fsEAGfFG3hu5Y7ocqdXvZNaPjMD6VNlOzAokzZ3986di55wYNjn6QWll28d4P5 hxKsQ5w78R0cS8QO7XZ529bkZzFNmVPoWHsyTDt8M9dYk8QoSvK321lDb+ioJ7iEP64o s/Ft8BG1b3c8HYHp4WKXZE5xPZoxlAdjmC53GMI/7yXiFDxHaaZ4yetRtRcIrBxhPbXp XC9CVqAAba7ATDB5O3NyR0nOgtD/d+srVkpzszKWaePpCEB1pL+vSDHInGUAmUCbfj11 dMYUpB1QMyaRHAiKnktBxwGUXJiXqr+HbHGwCVeedkrn6Hu/5qAphgmvY8yA6rilSivs QLtg== X-Received: by 10.49.120.225 with SMTP id lf1mr42056621qeb.14.1362503141391; Tue, 05 Mar 2013 09:05:41 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id z9sm43633830qae.5.2013.03.05.09.05.39 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 05 Mar 2013 09:05:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 5 Mar 2013 18:05:22 +0100 Message-Id: <1362503125-27057-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1362503125-27057-1-git-send-email-pbonzini@redhat.com> References: <1362503125-27057-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.216.50 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 3/6] iscsi: look for pkg-config file too X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Due to library conflicts, Fedora will have to put libiscsi in /usr/lib/iscsi. Simplify configuration by using a pkg-config file. The Fedora package will distribute one, and the patch to add it has been sent to upstream libiscsi as well. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- configure | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 2f98c5a..a9a7c99 100755 --- a/configure +++ b/configure @@ -2803,7 +2803,13 @@ if test "$libiscsi" != "no" ; then #include int main(void) { iscsi_unmap_sync(NULL,0,0,0,NULL,0); return 0; } EOF - if compile_prog "" "-liscsi" ; then + if $pkg_config --atleast-version=1.7.0 libiscsi --modversion >/dev/null 2>&1; then + libiscsi="yes" + libiscsi_cflags=$($pkg_config --cflags libiscsi 2>/dev/null) + libiscsi_libs=$($pkg_config --libs libiscsi 2>/dev/null) + CFLAGS="$CFLAGS $libiscsi_cflags" + LIBS="$LIBS $libiscsi_libs" + elif compile_prog "" "-liscsi" ; then libiscsi="yes" LIBS="$LIBS -liscsi" else