iscsi: look for pkg-config file too
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>
This commit is contained in:
parent
cb1b83e740
commit
3c33ea9640
|
@ -2803,7 +2803,13 @@ if test "$libiscsi" != "no" ; then
|
||||||
#include <iscsi/iscsi.h>
|
#include <iscsi/iscsi.h>
|
||||||
int main(void) { iscsi_unmap_sync(NULL,0,0,0,NULL,0); return 0; }
|
int main(void) { iscsi_unmap_sync(NULL,0,0,0,NULL,0); return 0; }
|
||||||
EOF
|
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"
|
libiscsi="yes"
|
||||||
LIBS="$LIBS -liscsi"
|
LIBS="$LIBS -liscsi"
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue