[Qemu-devel] [PATCH 13/20] sdl_config var is never changed from sdl-config value

[quintela]

From: Juan Quintela <address@hidden>


Signed-off-by: Juan Quintela <address@hidden>
---
 configure |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index a87959c..6368c4d 100755
--- a/configure
+++ b/configure
@@ -901,7 +901,6 @@ fi
 sdl_too_old=no

 if test "$sdl" = "yes" ; then
-    sdl_config="sdl-config"
     sdl=no
     sdl_static=no

@@ -910,8 +909,8 @@ 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
-        _sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'`
+    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
+        _sdlversion=`sdl-config --version | sed 's/[^0-9]//g'`
         if test "$_sdlversion" -lt 121 ; then
             sdl_too_old=yes
         else
@@ -923,13 +922,13 @@ EOF
         # static link with sdl ?
         if test "$sdl" = "yes" ; then
             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-config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` 
&& aa="yes"
+            sdl_static_libs=`sdl-config --static-libs 2>/dev/null`
             if [ "$aa" = "yes" ] ; then
                 sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"
             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-config --cflags 2> /dev/null` 
$TMPC $sdl_static_libs > /dev/null 2> /dev/null; then
                 sdl_static=yes
             fi
         fi # static link
@@ -946,7 +945,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-config --cflags 2> 
/dev/null` $TMPC `sdl-config --libs 2> /dev/null` > /dev/null 2>&1 ; then
        sdl_x11="yes"
     fi
 fi
@@ -1685,16 +1684,16 @@ if test "$sdl1" = "yes" ; then
   if test "$target_softmmu" = "no" -o "$static" = "yes"; then
     LIBS="$LIBS $sdl_static_libs"
   elif test "$sdl_x11" = "yes" ; then
-    LIBS="$LIBS `$sdl_config --libs` -lX11"
+    LIBS="$LIBS `sdl-config --libs` -lX11"
   elif test "$mingw32" = "yes" ; then
-    LIBS="$LIBS `$sdl_config --libs | sed s/-mwindows//g` -mconsole"
+    LIBS="$LIBS `sdl-config --libs | sed s/-mwindows//g` -mconsole"
   else
-    LIBS="$LIBS `$sdl_config --libs`"
+    LIBS="$LIBS `sdl-config --libs`"
   fi
   if [ "${aa}" = "yes" ] ; then
-    echo "SDL_CFLAGS=`$sdl_config --cflags` `aalib-config --cflags`" >> 
$config_host_mak
+    echo "SDL_CFLAGS=`sdl-config --cflags` `aalib-config --cflags`" >> 
$config_host_mak
   else
-    echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_host_mak
+    echo "SDL_CFLAGS=`sdl-config --cflags`" >> $config_host_mak
   fi
 fi
 if test "$cocoa" = "yes" ; then
-- 
1.6.2.5