[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 08/15] fix spelling of $pkg_config, move default
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 08/15] fix spelling of $pkg_config, move default together with other cross tools |
Date: |
Thu, 23 Dec 2010 11:43:55 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
configure | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/configure b/configure
index a3ff503..aeda349 100755
--- a/configure
+++ b/configure
@@ -209,6 +209,7 @@ objcopy="${cross_prefix}${OBJCOPY-objcopy}"
ld="${cross_prefix}${LD-ld}"
strip="${cross_prefix}${STRIP-strip}"
windres="${cross_prefix}${WINDRES-windres}"
+pkg_config="${cross_prefix}${PKG_CONFIG-pkg-config}"
# default flags for all hosts
QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
@@ -1159,12 +1160,11 @@ EOF
fi
##########################################
-# pkgconfig probe
+# pkg-config probe
-pkgconfig="${cross_prefix}pkg-config"
-if ! has $pkgconfig; then
+if ! has $pkg_config; then
# likely not cross compiling, or hope for the best
- pkgconfig=pkg-config
+ pkg_config=pkg-config
fi
##########################################
@@ -1186,15 +1186,15 @@ fi
# Look for sdl configuration program (pkg-config or sdl-config).
# Prefer variant with cross prefix if cross compiling,
# and favour pkg-config with sdl over sdl-config.
-if test -n "$cross_prefix" -a $pkgconfig != pkg-config && \
- $pkgconfig sdl --modversion >/dev/null 2>&1; then
- sdlconfig="$pkgconfig sdl"
+if test -n "$cross_prefix" -a $pkg_config != pkg-config && \
+ $pkg_config sdl --modversion >/dev/null 2>&1; then
+ sdlconfig="$pkg_config sdl"
_sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'`
elif test -n "$cross_prefix" && has ${cross_prefix}sdl-config; then
sdlconfig="${cross_prefix}sdl-config"
_sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'`
-elif $pkgconfig sdl --modversion >/dev/null 2>&1; then
- sdlconfig="$pkgconfig sdl"
+elif $pkg_config sdl --modversion >/dev/null 2>&1; then
+ sdlconfig="$pkg_config sdl"
_sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'`
elif has sdl-config; then
sdlconfig='sdl-config'
@@ -1274,8 +1274,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=`$pkgconfig --cflags gnutls 2> /dev/null`
- vnc_tls_libs=`$pkgconfig --libs gnutls 2> /dev/null`
+ vnc_tls_cflags=`$pkg_config --cflags gnutls 2> /dev/null`
+ vnc_tls_libs=`$pkg_config --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"
@@ -1589,8 +1589,8 @@ fi
##########################################
# curl probe
-if $pkgconfig libcurl --modversion >/dev/null 2>&1; then
- curlconfig="$pkgconfig libcurl"
+if $pkg_config libcurl --modversion >/dev/null 2>&1; then
+ curlconfig="$pkg_config libcurl"
else
curlconfig=curl-config
fi
@@ -1622,7 +1622,7 @@ if test "$check_utests" != "no" ; then
#include <check.h>
int main(void) { suite_create("qemu test"); return 0; }
EOF
- check_libs=`$pkgconfig --libs check`
+ check_libs=`$pkg_config --libs check`
if compile_prog "" $check_libs ; then
check_utests=yes
libs_tools="$check_libs $libs_tools"
@@ -1641,8 +1641,8 @@ if test "$bluez" != "no" ; then
#include <bluetooth/bluetooth.h>
int main(void) { return bt_error(0); }
EOF
- bluez_cflags=`$pkgconfig --cflags bluez 2> /dev/null`
- bluez_libs=`$pkgconfig --libs bluez 2> /dev/null`
+ bluez_cflags=`$pkg_config --cflags bluez 2> /dev/null`
+ bluez_libs=`$pkg_config --libs bluez 2> /dev/null`
if compile_prog "$bluez_cflags" "$bluez_libs" ; then
bluez=yes
libs_softmmu="$bluez_libs $libs_softmmu"
@@ -1686,7 +1686,7 @@ EOF
kvm_cflags="$kvm_cflags -I$kerneldir/arch/$cpu/include"
fi
else
- kvm_cflags=`$pkgconfig --cflags kvm-kmod 2>/dev/null`
+ kvm_cflags=`$pkg_config --cflags kvm-kmod 2>/dev/null`
fi
if compile_prog "$kvm_cflags" "" ; then
kvm=yes
--
1.7.3.2
- [Qemu-devel] [PATCH v3 00/15] preparation for autoconfy configure script, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 01/15] default compilation tools to environment variables, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 02/15] default make and install to environment variables, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 03/15] move feature variables to the top, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 04/15] fix sparse support (?), Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 05/15] test cc with the complete set of chosen flags, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 06/15] do not pass bogus $(SRC_PATH) include paths to cc during configure, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 08/15] fix spelling of $pkg_config, move default together with other cross tools,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v3 07/15] provide portable HOST_LONG_BITS test, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 09/15] do not default to non-prefixed pkg-config when cross compiling, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 11/15] move "ln -sf" emulation to a function, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 10/15] reorganize sdl-config tests, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 12/15] remove source_path_used, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 15/15] make trace options use autoconfy names, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 13/15] move --srcdir detection earlier, Paolo Bonzini, 2010/12/23
- [Qemu-devel] [PATCH v3 14/15] remove HOST_CC mention from roms/{sea, vga}bios/config.mak, Paolo Bonzini, 2010/12/23