Move to configure CONFIG_SOLARIS libraries needed always

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:

diff --git a/Makefile b/Makefile
index 75df24a73d158f55dde3c52ee3e7e9b56669c3b4..a79d1d31fdf2b380e4099a3a072bd029f2058d68 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,10 +27,6 @@ else
 DOCS=
 endif
 
-ifdef CONFIG_SOLARIS
-LIBS+=-lsocket -lnsl -lresolv
-endif
-
 ifdef CONFIG_WIN32
 LIBS+=-lwinmm -lws2_32 -liphlpapi
 endif

diff --git a/Makefile.target b/Makefile.target
index 090efb00782855f0d7b79c3c9aedb297fee3b1c9..1f9886220481dc7875eb3e93578aebc9b4a18e2e 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -52,7 +52,6 @@ ifdef CONFIG_WIN32
 LIBS+=-lwinmm -lws2_32 -liphlpapi
 endif
 ifdef CONFIG_SOLARIS
-LIBS+=-lsocket -lnsl -lresolv
 ifdef CONFIG_NEEDS_LIBSUNMATH
 LIBS+=-lsunmath
 LDFLAGS+=-L/opt/SUNWspro/prod/lib -R/opt/SUNWspro/prod/lib

diff --git a/configure b/configure
index 0f76f089c97b3c194d2b71555f84ff181a09452e..09604232af866c2c37649481fdee45b1c3b20c85 100755 (executable)
--- a/configure
+++ b/configure
@@ -321,6 +321,7 @@ SunOS)
   fi
   audio_possible_drivers="oss sdl"
   CFLAGS="-std=gnu99 $CFLAGS"
+  LIBS="-lsocket -lnsl -lresolv $LIBS"
 ;;
 AIX)
   aix="yes"