X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=configure;h=1a75fa4830555f871f266b9c03e24e0d10595948;hp=8f8674980df1318ba59b76c9bffebd486dc9df11;hb=adaa46d81bca50eb16a40fea47e42e3df4b7e2cd;hpb=7366ad05740d4cbbe5b43daa3b9b9efe74df34b3

diff --git a/configure b/configure
index 8f867498..1a75fa48 100755
--- a/configure
+++ b/configure
@@ -87,7 +87,7 @@ compile_object() {
 
 compile_prog() {
   local_cflags="$1"
-  local_ldflags="$2"
+  local_ldflags="$2 $LIBS"
   echo "Compiling test case $3" >> config.log
   do_cc $CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags
 }
@@ -193,6 +193,7 @@ SunOS)
   if test -z "$cpu" && test "$(isainfo -k)" = "amd64"; then
     cpu="x86_64"
   fi
+  LIBS="-lnsl -lsocket"
   ;;
 CYGWIN*)
   echo "Forcing known good options on Windows"
@@ -906,9 +907,6 @@ int main(int argc, char **argv)
 EOF
 if compile_prog "" "" "TCP_NODELAY"; then
   tcp_nodelay="yes"
-elif compile_prog "" "-lnsl -lsocket" "TCP_NODELAY"; then
-  tcp_nodelay="yes"
-  LIBS="-lnsl -lsocket $LIBS" 
 fi
 echo "TCP_NODELAY                   $tcp_nodelay"