From 07d9ac44422cf5dc3427c94487f7255479db6814 Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Mon, 3 Aug 2009 14:46:25 +0200
Subject: [PATCH] move SDL_LIBS Win32 hack to configure

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
---
 Makefile.target | 4 ----
 configure       | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index d34156c120..9ffc0b7086 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -441,10 +441,6 @@ ifeq ($(ARCH),ia64)
 LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/ia64.ld
 endif
 
-ifdef CONFIG_WIN32
-SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
-endif
-
 # profiling code
 ifdef TARGET_GPROF
 LDFLAGS+=-p
diff --git a/configure b/configure
index 3229e6c13a..a014e786b0 100755
--- a/configure
+++ b/configure
@@ -887,6 +887,9 @@ EOF
   if compile_prog "$sdl_cflags" "$sdl_libs" ; then
     sdl_libs="$sdl_libs -lX11"
   fi
+  if test "$mingw32" = "yes" ; then
+    sdl_libs="`echo $sdl_libs | sed s/-mwindows//g` -mconsole"
+  fi
 fi
 
 ##########################################