[Qemu-devel] [PATCH 18/20] Add -lX11 to sdl_libs when needed, and remove sdl_x11 variable

[quintela]

From: Juan Quintela <address@hidden>


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

diff --git a/configure b/configure
index d9fc921..69ce350 100755
--- a/configure
+++ b/configure
@@ -201,7 +201,6 @@ aix="no"
 blobs="yes"
 fdt="yes"
 sdl="yes"
-sdl_x11="no"
 xen="yes"
 pkgversion=""

@@ -949,7 +948,7 @@ cat > $TMPC <<EOF
 int main(void) { return 0; }
 EOF
     if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > 
/dev/null 2>&1 ; then
-       sdl_x11="yes"
+       sdl_libs="$sdl_libs -lX11"
     fi
 fi

@@ -1683,8 +1682,6 @@ if test "$sdl1" = "yes" ; then
   echo "CONFIG_SDL=y" >> $config_host_mak
   if test "$static" = "yes"; then
     LIBS="$LIBS $sdl_static_libs"
-  elif test "$sdl_x11" = "yes" ; then
-    LIBS="$LIBS $sdl_libs -lX11"
   elif test "$mingw32" = "yes" ; then
     LIBS="$LIBS `sdl-config --libs | sed s/-mwindows//g` -mconsole"
   else
-- 
1.6.2.5