diff -rU 10 site/config/ompi_config_pthreads.m4 p3/config/ompi_config_pthreads.m4
--- site/config/ompi_config_pthreads.m4	2006-08-15 22:14:05.000000000 +0200
+++ p3/config/ompi_config_pthreads.m4	2007-09-27 09:10:21.000000000 +0200
@@ -473,24 +473,24 @@
           CXXCPPFLAGS="$CXXCPPFLAGS $PTHREAD_CXXCPPFLAGS"
         fi
       ;;
     esac
     LIBS="$orig_LIBS $PTHREAD_LIBS"
     AC_LANG_PUSH(C++)
     OMPI_INTL_PTHREAD_TRY_LINK(ompi_pthread_cxx_success=1, 
                               ompi_pthread_cxx_success=0)
     AC_LANG_POP(C++)
     if test "$ompi_pthread_cxx_success" = "1"; then
-      PTHREAD_LIBS="$pl"
       AC_MSG_RESULT([yes])
     else
       CXXCPPFLAGS="$orig_CXXCPPFLAGS"
+      LIBS="$orig_LIBS"
       AC_MSG_RESULT([no])
       AC_MSG_ERROR([Can not find working threads configuration.  aborting])
     fi
   else 
     for pl in $plibs; do
       AC_MSG_CHECKING([if C++ compiler and POSIX threads work with $pl])
       case "${host_cpu}-${host-_os}" in
         *-aix* | *-freebsd*)
           if test "`echo $CXXCPPFLAGS | grep 'D_THREAD_SAFE'`" = ""; then
             PTRHEAD_CXXCPPFLAGS="-D_THREAD_SAFE"
@@ -508,61 +508,62 @@
       AC_LANG_PUSH(C++)
       OMPI_INTL_PTHREAD_TRY_LINK(ompi_pthread_cxx_success=1, 
                                 ompi_pthread_cxx_success=0)
       AC_LANG_POP(C++)
       if test "$ompi_pthread_cxx_success" = "1"; then
 	PTHREAD_LIBS="$pl"
         AC_MSG_RESULT([yes])
       else
         PTHREAD_CXXCPPFLAGS=
         CXXCPPFLAGS="$orig_CXXCPPFLAGS"
+	LIBS="$orig_LIBS"
         AC_MSG_RESULT([no])
       fi
     done
   fi
 fi
 ])dnl
 
 
 AC_DEFUN([OMPI_INTL_POSIX_THREADS_LIBS_FC],[
 #
 # Fortran compiler
 #
 if test "$ompi_pthread_f77_success" = "0" -a "$OMPI_WANT_F77_BINDINGS" = "1"; then
   if test ! "$ompi_pthread_c_success" = "0" -a ! "$PTHREAD_LIBS" = "" ; then
     AC_MSG_CHECKING([if F77 compiler and POSIX threads work with $PTHREAD_LIBS])
     LIBS="$orig_LIBS $PTHREAD_LIBS"
     AC_LANG_PUSH(C)
     OMPI_INTL_PTHREAD_TRY_LINK_F77(ompi_pthread_f77_success=1, 
                                   ompi_pthread_f77_success=0)
     AC_LANG_POP(C)
-    LIBS="$orig_LIBS"
     if test "$ompi_pthread_f77_success" = "1"; then
       AC_MSG_RESULT([yes])
     else
+      LIBS="$orig_LIBS"
       AC_MSG_RESULT([no])
       AC_MSG_ERROR([Can not find working threads configuration.  aborting])
     fi
   else
     for pl in $plibs; do
       AC_MSG_CHECKING([if F77 compiler and POSIX threads work with $pl])
       LIBS="$orig_LIBS $pl"
       AC_LANG_PUSH(C)
       OMPI_INTL_PTHREAD_TRY_LINK_F77(ompi_pthread_f77_success=1, 
                                     ompi_pthread_f77_success=0)
       AC_LANG_POP(C)
-      LIBS="$orig_LIBS"
       if test "$ompi_pthread_f77_success" = "1"; then
 	PTHREAD_LIBS="$pl"
         AC_MSG_RESULT([yes])
         break
       else
+        LIBS="$orig_LIBS"
         AC_MSG_RESULT([no])
       fi
     done
   fi
 fi
 ])dnl
 
 
 AC_DEFUN([OMPI_INTL_POSIX_THREADS_LIBS],[
 # Begin: OMPI_INTL_POSIX_THREADS_LIBS