From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NVCcO-0001Hr-0v
	for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:27:16 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NVCcJ-0001GL-E6
	for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:27:15 -0500
Received: from [199.232.76.173] (port=46285 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NVCcJ-0001GH-6K
	for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:27:11 -0500
Received: from mail-qy0-f194.google.com ([209.85.221.194]:34668)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1NVCcI-0001J3-Sb
	for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:27:11 -0500
Received: by mail-qy0-f194.google.com with SMTP id 32so3454591qyk.4
	for <qemu-devel@nongnu.org>; Wed, 13 Jan 2010 15:27:10 -0800 (PST)
Message-ID: <4B4E56CB.8050708@codemonkey.ws>
Date: Wed, 13 Jan 2010 17:27:07 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH v3 1/4] use cross-prefix for pkgconfig
References: <1263372776-23753-1-git-send-email-pbonzini@redhat.com>
	<1263372776-23753-2-git-send-email-pbonzini@redhat.com>
In-Reply-To: <1263372776-23753-2-git-send-email-pbonzini@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org

On 01/13/2010 02:52 AM, Paolo Bonzini wrote:
> 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>
>    

Applied all.  Thanks.

Regards,

Anthony Liguori

> ---
>   configure |   19 ++++++++++++++-----
>   1 files changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/configure b/configure
> index 5c056f5..f3584db 100755
> --- a/configure
> +++ b/configure
> @@ -965,6 +965,15 @@ EOF
>   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
>   if test "$sparse" != "no" ; then
>     if test -x "$(which cgcc 2>/dev/null)"; then
> @@ -1047,8 +1056,8 @@ if test "$vnc_tls" != "no" ; then
>   #include<gnutls/gnutls.h>
>   int main(void) { gnutls_session_t s; gnutls_init(&s, GNUTLS_SERVER); return 0; }
>   EOF
> -  vnc_tls_cflags=`pkg-config --cflags gnutls 2>  /dev/null`
> -  vnc_tls_libs=`pkg-config --libs gnutls 2>  /dev/null`
> +  vnc_tls_cflags=`$pkgconfig --cflags gnutls 2>  /dev/null`
> +  vnc_tls_libs=`$pkgconfig --libs gnutls 2>  /dev/null`
>     if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then
>       vnc_tls=yes
>       libs_softmmu="$vnc_tls_libs $libs_softmmu"
> @@ -1320,7 +1329,7 @@ if test "$check_utests" != "no" ; then
>   #include<check.h>
>   int main(void) { suite_create("qemu test"); return 0; }
>   EOF
> -  check_libs=`pkg-config --libs check`
> +  check_libs=`$pkgconfig --libs check`
>     if compile_prog "" $check_libs ; then
>       check_utests=yes
>       libs_tools="$check_libs $libs_tools"
> @@ -1339,8 +1348,8 @@ if test "$bluez" != "no" ; then
>   #include<bluetooth/bluetooth.h>
>   int main(void) { return bt_error(0); }
>   EOF
> -  bluez_cflags=`pkg-config --cflags bluez 2>  /dev/null`
> -  bluez_libs=`pkg-config --libs bluez 2>  /dev/null`
> +  bluez_cflags=`$pkgconfig --cflags bluez 2>  /dev/null`
> +  bluez_libs=`$pkgconfig --libs bluez 2>  /dev/null`
>     if compile_prog "$bluez_cflags" "$bluez_libs" ; then
>       bluez=yes
>       libs_softmmu="$bluez_libs $libs_softmmu"
>