mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use cross-prefix for pkgconfig

Browse Source 
Since pkgconfig can give different output for different targets,
it should be tried with the cross-compilation prefix first.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2010-01-13 09:52:53 +01:00 committed by Anthony Liguori
parent 884a0c7677
commit f91672e564
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure vendored
View File

@ -965,6 +965,15 @@ EOF
fi fi
fi fi
##########################################
# pkgconfig probe
pkgconfig="${cross_prefix}pkg-config"
if ! test -x "$(which $pkgconfig 2>/dev/null)"; then
# likely not cross compiling, or hope for the best
pkgconfig=pkg-config
fi
########################################## ##########################################
# Sparse probe # Sparse probe
if test "$sparse" != "no" ; then if test "$sparse" != "no" ; then
@ -1048,8 +1057,8 @@ if test "$vnc_tls" != "no" ; then
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
int main(void) { gnutls_session_t s; gnutls_init(&s, GNUTLS_SERVER); return 0; } int main(void) { gnutls_session_t s; gnutls_init(&s, GNUTLS_SERVER); return 0; }
EOF EOF
vnc_tls_cflags=`pkg-config --cflags gnutls 2> /dev/null` vnc_tls_cflags=`$pkgconfig --cflags gnutls 2> /dev/null`
vnc_tls_libs=`pkg-config --libs gnutls 2> /dev/null` vnc_tls_libs=`$pkgconfig --libs gnutls 2> /dev/null`
if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then
vnc_tls=yes vnc_tls=yes
libs_softmmu="$vnc_tls_libs $libs_softmmu" libs_softmmu="$vnc_tls_libs $libs_softmmu"
@ -1321,7 +1330,7 @@ if test "$check_utests" != "no" ; then
#include <check.h> #include <check.h>
int main(void) { suite_create("qemu test"); return 0; } int main(void) { suite_create("qemu test"); return 0; }
EOF EOF
check_libs=`pkg-config --libs check` check_libs=`$pkgconfig --libs check`
if compile_prog "" $check_libs ; then if compile_prog "" $check_libs ; then
check_utests=yes check_utests=yes
libs_tools="$check_libs $libs_tools" libs_tools="$check_libs $libs_tools"
@ -1340,8 +1349,8 @@ if test "$bluez" != "no" ; then
#include <bluetooth/bluetooth.h> #include <bluetooth/bluetooth.h>
int main(void) { return bt_error(0); } int main(void) { return bt_error(0); }
EOF EOF
bluez_cflags=`pkg-config --cflags bluez 2> /dev/null` bluez_cflags=`$pkgconfig --cflags bluez 2> /dev/null`
bluez_libs=`pkg-config --libs bluez 2> /dev/null` bluez_libs=`$pkgconfig --libs bluez 2> /dev/null`
if compile_prog "$bluez_cflags" "$bluez_libs" ; then if compile_prog "$bluez_cflags" "$bluez_libs" ; then
bluez=yes bluez=yes
libs_softmmu="$bluez_libs $libs_softmmu" libs_softmmu="$bluez_libs $libs_softmmu"