From 6362a53f55c30b0638b1c5dae9c510a94e2926a9 Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Mon, 3 Aug 2009 14:46:32 +0200
Subject: [PATCH] Test if we need -lutil in ,/configure

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

diff --git a/Makefile.target b/Makefile.target
index 10a5ebebde..5928135c57 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -395,16 +395,6 @@ ifdef CONFIG_SLIRP
 QEMU_CFLAGS+=-I$(SRC_PATH)/slirp
 endif
 
-# specific flags are needed for non soft mmu emulator
-ifndef CONFIG_DARWIN
-ifndef CONFIG_WIN32
-ifndef CONFIG_SOLARIS
-ifndef CONFIG_AIX
-LIBS+=-lutil
-endif
-endif
-endif
-endif
 ifdef TARGET_GPROF
 vl.o: QEMU_CFLAGS+=-p
 LDFLAGS+=-p
diff --git a/configure b/configure
index e4f763bdbc..90202540d3 100755
--- a/configure
+++ b/configure
@@ -1402,6 +1402,11 @@ else
     exit 1
 fi
 
+if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaries" != yes -a \
+        "$aix" != "yes" ; then
+    libs_softmmu="-lutil $libs_softmmu"
+fi
+
 # End of CC checks
 # After here, no more $cc or $ld runs