[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH 2/3] configure: fix detection for SDL libs when st
From: |
Yann E. MORIN |
Subject: |
[Qemu-trivial] [PATCH 2/3] configure: fix detection for SDL libs when static linking |
Date: |
Mon, 20 Aug 2012 23:39:08 +0200 |
If using pkg-config, we must use '--static --libs', not '--static-libs'
which is solely for sdl-config.
Signed-off-by: "Yann E. MORIN" <address@hidden>
---
configure | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 8f8ae8a..5b52f9d 100755
--- a/configure
+++ b/configure
@@ -1645,9 +1645,11 @@ fi
if $pkg_config sdl --modversion >/dev/null 2>&1; then
sdlconfig="$pkg_config sdl"
+ sdlconfig_staticlibs="--static --libs"
_sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'`
elif has ${sdl_config}; then
sdlconfig="$sdl_config"
+ sdlconfig_staticlibs="--static-libs"
_sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'`
else
if test "$sdl" = "yes" ; then
@@ -1668,7 +1670,7 @@ int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
EOF
sdl_cflags=`$sdlconfig --cflags 2> /dev/null`
if test "$static" = "yes" ; then
- sdl_libs=`$sdlconfig --static-libs 2>/dev/null`
+ sdl_libs=`$sdlconfig $sdlconfig_staticlibs 2>/dev/null`
else
sdl_libs=`$sdlconfig --libs 2> /dev/null`
fi
--
1.7.2.5