[Qemu-devel] [PATCH 17/20] use sdl_{cflags, libs} insteaf of calling sdl-config

[quintela]

From: Juan Quintela <address@hidden>


Signed-off-by: Juan Quintela <address@hidden>
---
 configure |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index ce66d6d..d9fc921 100755
--- a/configure
+++ b/configure
@@ -909,7 +909,9 @@ cat > $TMPC << EOF
 #undef main /* We don't want SDL to override our main() */
 int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
 EOF
-    if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} `sdl-config --cflags 2> 
/dev/null` $TMPC `sdl-config --libs 2> /dev/null` > $TMPSDLLOG 2>&1 ; then
+    sdl_cflags=`sdl-config --cflags 2> /dev/null`
+    sdl_libs=`sdl-config --libs 2> /dev/null`
+    if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags  $TMPC $sdl_libs > 
$TMPSDLLOG 2>&1 ; then
         _sdlversion=`sdl-config --version | sed 's/[^0-9]//g'`
         if test "$_sdlversion" -lt 121 ; then
             sdl_too_old=yes
@@ -924,13 +926,12 @@ EOF
             aa="no"
             `sdl-config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` 
&& aa="yes"
             sdl_static_libs=`sdl-config --static-libs 2>/dev/null`
-            sdl_cflags=`sdl-config --cflags`
             if [ "$aa" = "yes" ] ; then
                 sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"
                 sdl_cflags="$sdl_cflags `aalib-config --cflags`"
             fi

-            if $cc -o $TMPE ${OS_CFLAGS} `sdl-config --cflags 2> /dev/null` 
$TMPC $sdl_static_libs > /dev/null 2> /dev/null; then
+            if $cc -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_static_libs > 
/dev/null 2> /dev/null; then
                 sdl_static=yes
             fi
         fi # static link
@@ -947,7 +948,7 @@ cat > $TMPC <<EOF
 #endif
 int main(void) { return 0; }
 EOF
-    if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} `sdl-config --cflags 2> 
/dev/null` $TMPC `sdl-config --libs 2> /dev/null` > /dev/null 2>&1 ; then
+    if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > 
/dev/null 2>&1 ; then
        sdl_x11="yes"
     fi
 fi
@@ -1683,11 +1684,11 @@ if test "$sdl1" = "yes" ; then
   if test "$static" = "yes"; then
     LIBS="$LIBS $sdl_static_libs"
   elif test "$sdl_x11" = "yes" ; then
-    LIBS="$LIBS `sdl-config --libs` -lX11"
+    LIBS="$LIBS $sdl_libs -lX11"
   elif test "$mingw32" = "yes" ; then
     LIBS="$LIBS `sdl-config --libs | sed s/-mwindows//g` -mconsole"
   else
-    LIBS="$LIBS `sdl-config --libs`"
+    LIBS="$LIBS $sdl_libs"
   fi
   echo "SDL_CFLAGS=$sdl_cflags" >> $config_host_mak
 fi
-- 
1.6.2.5