Better way to select -lrt, by Andrzei Zaborowski.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2486 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/Makefile b/Makefile
index b6d7b1f146522888c0bc28ee2d18da0ca092717a..9b9a32d0c826538a0862c71eb46cfb668e5e6763 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,11 +24,7 @@ else
 DOCS=
 endif
 
-ifndef CONFIG_DARWIN
-ifndef CONFIG_WIN32
-LIBS+=-lrt
-endif
-endif
+LIBS+=$(AIOLIBS)
 
 all: $(TOOLS) $(DOCS) recurse-all
 

diff --git a/Makefile.target b/Makefile.target
index 8eaa8dd7878ead7a9f17d542d4d34dee8e49f4a6..9f7a804a4f18dc262eff848a9ec58e68f817897e 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -431,6 +431,7 @@ VL_OBJS+=$(addprefix slirp/, $(SLIRP_OBJS))
 endif
 
 VL_LDFLAGS=
+VL_LIBS=$(AIOLIBS)
 # specific flags are needed for non soft mmu emulator
 ifdef CONFIG_STATIC
 VL_LDFLAGS+=-static
@@ -441,7 +442,7 @@ endif
 ifndef CONFIG_DARWIN
 ifndef CONFIG_WIN32
 ifndef CONFIG_SOLARIS
-VL_LIBS=-lutil -lrt
+VL_LIBS+=-lutil
 endif
 endif
 endif

diff --git a/configure b/configure
index af4c29bc11a4d4b8997fc129abe51e2229ea87b0..515d1f38ec58fff4d77a42b7412350b6f2e76394 100755 (executable)
--- a/configure
+++ b/configure
@@ -159,6 +159,12 @@ if [ "$bsd" = "yes" ] ; then
   fi
 fi
 
+if [ "$bsd" = "yes" -o "$darwin" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then
+    AIOLIBS=
+else
+    AIOLIBS="-lrt"
+fi
+
 # find source path
 source_path=`dirname "$0"`
 if [ -z "$source_path" ]; then
@@ -658,6 +664,7 @@ echo "OS_CFLAGS=$OS_CFLAGS" >> $config_mak
 echo "CFLAGS=$CFLAGS" >> $config_mak
 echo "LDFLAGS=$LDFLAGS" >> $config_mak
 echo "EXESUF=$EXESUF" >> $config_mak
+echo "AIOLIBS=$AIOLIBS" >> $config_mak
 if test "$cpu" = "i386" ; then
   echo "ARCH=i386" >> $config_mak
   echo "#define HOST_I386 1" >> $config_h