From: Paolo Bonzini <pbonzini@redhat.com>

Subject: [PATCH 3/6] iscsi: look for pkg-config file too

Date: Tue,  5 Mar 2013 18:05:22 +0100

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 <pbonzini@redhat.com>

---

 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 <iscsi/iscsi.h>

 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

-- 

1.8.1.2