diff --git a/config/ompi_setup_libevent.m4 b/config/ompi_setup_libevent.m4
index 95ac5ecb8b..6b29988581 100644
--- a/config/ompi_setup_libevent.m4
+++ b/config/ompi_setup_libevent.m4
@@ -26,7 +26,7 @@ AC_ARG_WITH(event-rtsig,
   [usertsig=yes], [usertsig=no])
 
 dnl Checks for libraries.
-AC_CHECK_LIB(socket, socket)
+dnl AC_CHECK_LIB(socket, socket)
 
 dnl Checks for header files.
 AC_HEADER_STDC
diff --git a/configure.ac b/configure.ac
index 8f3fcad466..8f74305069 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1134,16 +1134,21 @@ AC_CACHE_SAVE
 
 ompi_show_title "Library and Function tests"
 
-# -lsocket
-# -lnsl
-# atexit
-# getcwd
-# atoll
-# strtoll
-# yield
-# vscanf
+AC_CHECK_LIB([util], [openpty], 
+             [WRAPPER_EXTRA_LIBS="$WRAPPER_EXTRA_LIBS -lutil" 
+              LIBLAM_EXTRA_LIBS="$LIBLAMEXTRALIBS -lutil"
+              LIBS="$LIBS -lutil"])
+
+AC_CHECK_LIB([nsl], [gethostbyname],
+             [WRAPPER_EXTRA_LIBS="$WRAPPER_EXTRA_LIBS -lnsl"
+              LIBLAM_EXTRA_LIBS="$LIBLAMEXTRALIBS -lnsl"
+              LIBS="$LIBS -lnsl"])
+
+AC_CHECK_LIB([socket], [socket], 
+             [WRAPPER_EXTRA_LIBS="$WRAPPER_EXTRA_LIBS -lsocket"
+              LIBLAM_EXTRA_LIBS="$LIBLAMEXTRALIBS -lsocket"
+              LIBS="$LIBS -lsocket"])
 
-AC_CHECK_LIB([util], [openpty], [WRAPPER_EXTRA_LIBS="$WRAPPER_EXTRA_LIBS -lutil" LIBLAM_EXTRA_LIBS="$LIBLAMEXTRALIBS -lutil" LIBS="$LIBS -lutil]")
 AC_CHECK_FUNCS([asprintf snprintf vasprintf vsnprintf openpty isatty htonl ntohl htons ntohs getpwuid fork waitpid execve pipe setsid mmap])
 
 #