[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 10/15] reorganize sdl-config tests
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 10/15] reorganize sdl-config tests |
Date: |
Thu, 23 Dec 2010 11:43:57 +0100 |
This also allows overriding it with SDL_CONFIG, and warning in suspicious
cross-compilation scenarios.
Signed-off-by: Paolo Bonzini <address@hidden>
---
configure | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
index a9423b9..959bc97 100755
--- a/configure
+++ b/configure
@@ -210,6 +210,7 @@ ld="${cross_prefix}${LD-ld}"
strip="${cross_prefix}${STRIP-strip}"
windres="${cross_prefix}${WINDRES-windres}"
pkg_config="${cross_prefix}${PKG_CONFIG-pkg-config}"
+sdl_config="${cross_prefix}${SDL_CONFIG-sdl-config}"
# default flags for all hosts
QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
@@ -1183,21 +1184,17 @@ fi
##########################################
# SDL probe
-# 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 $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 $pkg_config sdl --modversion >/dev/null 2>&1; then
+# Look for sdl configuration program (pkg-config or sdl-config). Try
+# sdl-config even without cross prefix, and favour pkg-config over sdl-config.
+if test "`basename $sdl_config`" != sdl-config && ! has ${sdl_config}; then
+ sdl_config=sdl-config
+fi
+
+if $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'
+elif has ${sdl_config}; then
+ sdlconfig="$sdl_config"
_sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'`
else
if test "$sdl" = "yes" ; then
@@ -1205,6 +1202,9 @@ else
fi
sdl=no
fi
+if test -n "$cross_prefix" && test "`basename $sdlconfig`" = sdl-config; then
+ echo warning: using "\"$sdlconfig\"" to detect cross-compiled sdl >&2
+fi
sdl_too_old=no
if test "$sdl" != "no" ; then
--
1.7.3.2
- [Qemu-devel] [PATCH v3 01/15] default compilation tools to environment variables, (continued)
- [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, 2010/12/23
- [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 <=
- [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