Index: /mpich2/trunk/src/pm/hydra/configure.in
===================================================================
--- /mpich2/trunk/src/pm/hydra/configure.in (revision 4846)
+++ /mpich2/trunk/src/pm/hydra/configure.in (revision 4860)
@@ -32,5 +32,6 @@
 dnl Check if the necessary headers are available
 AC_CHECK_HEADERS(unistd.h stdlib.h string.h strings.h stdarg.h sys/types.h sys/socket.h \
-		 sched.h pthread.h sys/stat.h)
+		 sched.h pthread.h sys/stat.h sys/param.h netinet/in.h netinet/tcp.h \
+		 sys/un.h netdb.h)
 
 dnl Check if the pthread library is present. Apparently, just checking
@@ -43,4 +44,7 @@
    LDFLAGS="$LDFLAGS -lpthread"
 fi
+
+AC_SEARCH_LIBS(socket,socket,LDFLAGS="$LDFLAGS -lsocket",)
+AC_SEARCH_LIBS(gethostbyname,nsl,LDFLAGS="$LDFLAGS -lnsl",)
 
 dnl Check for necessary functions
@@ -273,5 +277,5 @@
 AC_ARG_ENABLE(hydra-procbind, [  --enable-hydra-procbind       Process Binding],
 			      [ procbind=$enableval ],
-			      [ procbind=no ])
+			      [ procbind=auto ])
 AC_MSG_CHECKING(process binding)
 
@@ -279,5 +283,8 @@
    old_CFLAGS=$CFLAGS
    CFLAGS="$CFLAGS -I${srcdir}/utils/plpa"
-   AC_TRY_COMPILE([#include <plpa_internal.h>],[PLPA_NAME(api_type_t) p; PLPA_NAME(api_probe) (&p);],plpa_works=yes,plpa_works=no)
+   AC_TRY_LINK([#include <plpa_internal.h>],[
+PLPA_NAME(api_type_t) p;
+PLPA_NAME(api_probe)(&p);
+],plpa_works=yes,plpa_works=no)
    CFLAGS=$old_CFLAGS
    if test "$plpa_works" = "yes" ; then