diff --git a/configure.ac b/configure.ac
index 5bb9346e0..2bc22b4a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,8 @@ transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'
 
 AC_CHECK_LIB([crypto],[CRYPTO_new_ex_data])
 AC_CHECK_LIB([ssl],[SSL_library_init])
+AC_SEARCH_LIBS([socket], [socket net])
+AC_SEARCH_LIBS([gethostbyname], [nsl bind])
 
 dnl ----------------------------------------------------------------------------
 dnl
@@ -147,10 +149,6 @@ EOF
     fi
     ;;
 
-  *solaris*)
-    LIBS="$LIBS -lsocket -lnsl"
-    ;;
-
 esac
 AM_CONDITIONAL([HAVE_BEOS],[test "x$beos" = "xyes"])
 AM_CONDITIONAL([HAVE_DARWIN],[test "x$darwin" = "xyes"])