- Make fortran pthread tests work properly

- Add THREAD_*FLAGS to all the relevant places
- Propagate THREAD_*FLAGS to the wrappers
- Add src/mpi/win/Makefile to AC_OUTPUT

This commit was SVN r868.

config/lam_config_pthreads.m4

@@ -205,7 +205,7 @@ AC_DEFUN([LAM_INTL_POSIX_THREADS_PLAIN_FC], [
 #
 # Fortran compiler
 #
-if test "$lam_pthread_f77_success" = "0" -a "$LAM_WANT_FORTRAN" = "1"; then
+if test "$lam_pthread_f77_success" = "0" -a "$WANT_MPI_F77" = "1"; then
   AC_MSG_CHECKING([if F77 compiler and POSIX threads work as is])
   if test "$HAVE_POSIX_THREADS" = "1" ; then
     run_this_test=1
@@ -255,7 +255,7 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
                   [LAM_INTL_POSIX_THREADS_PLAIN_CXX], 
                   [lam_pthread_cxx_success=1])
 
-AC_PROVIDE_IFELSE([LAM_PROG_F77], 
+AC_PROVIDE_IFELSE([AC_PROG_F77], 
                   [LAM_INTL_POSIX_THREADS_PLAIN_FC],
                   [lam_pthread_f77_success=1])
 
@@ -324,7 +324,7 @@ AC_DEFUN([LAM_INTL_POSIX_THREADS_SPECIAL_FLAGS_FC], [
 #
 # Fortran compiler
 #
-if test "$lam_pthread_f77_success" = "0" -a "$LAM_WANT_FORTRAN" = "1"; then
+if test "$lam_pthread_f77_success" = "0" -a "$WANT_MPI_F77" = "1"; then
   for pf in $pflags; do
     AC_MSG_CHECKING([if F77 compiler and POSIX threads work with $pf])
     FFLAGS="$orig_FFLAGS $pf"
@@ -373,7 +373,7 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
                   [LAM_INTL_POSIX_THREADS_SPECIAL_FLAGS_CXX], 
                   [lam_pthread_cxx_success=1])
 
-AC_PROVIDE_IFELSE([LAM_PROG_F77], 
+AC_PROVIDE_IFELSE([AC_PROG_F77], 
                   [LAM_INTL_POSIX_THREADS_SPECIAL_FLAGS_FC],
                   [lam_pthread_f77_success=1])
 
@@ -500,7 +500,7 @@ AC_DEFUN([LAM_INTL_POSIX_THREADS_LIBS_FC],[
 #
 # Fortran compiler
 #
-if test "$lam_pthread_f77_success" = "0" -a "$LAM_WANT_FORTRAN" = "1"; then
+if test "$lam_pthread_f77_success" = "0" -a "$WANT_MPI_F77" = "1"; then
   if test ! "$lam_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"
@@ -559,7 +559,7 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
                   [LAM_INTL_POSIX_THREADS_LIBS_CXX], 
                   [lam_pthread_cxx_success=1])
 
-AC_PROVIDE_IFELSE([LAM_PROG_F77], 
+AC_PROVIDE_IFELSE([AC_PROG_F77], 
                   [LAM_INTL_POSIX_THREADS_LIBS_FC],
                   [lam_pthread_f77_success=1])
 
@@ -610,7 +610,7 @@ CXXCPPFLAGS="$orig_CXXCPPFLAGS"
 LDFLAGS="$orig_LDFLAGS"
 LIBS="$orig_LIBS"
 
-if test "$LAM_WANT_FORTRAN" != "1"; then
+if test "$WANT_MPI_F77" != "1"; then
   lam_pthread_f77_success=1
 fi
 

configure.ac

@@ -469,6 +469,18 @@ AC_DEFINE_UNQUOTED(MPI_Offset, $MPI_OFFSET_TYPE, [Type of MPI_Offset])
 #
 
 LAM_CONFIG_THREADS
+CFLAGS="$CFLAGS $THREAD_CFLAGS"
+CXXFLAGS="$CXXFLAGS $THREAD_CXXFLAGS"
+CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS"
+CXXCPPFLAGS="$CXXCPPFLAGS $THREAD_CXXCPPFLAGS"
+LDFLAGS="$LDFLAGS $THREAD_LDFLAGS"
+LIBS="$LIBS $THREAD_LIBS"
+
+WRAPPER_EXTRA_CFLAGS="$WRAPPER_EXTRA_CFLAGS $THREAD_CFLAGS"
+WRAPPER_EXTRA_CXXFLAGS="$WRAPPER_EXTRA_CXXFLAGS $THREAD_CXXFLAGS"
+WRAPPER_EXTRA_FFLAGS="$WRAPPER_EXTRA_FFLAGS $THREAD_FFLAGS"
+WRAPPER_EXTRA_LDFLAGS="$WRAPPER_EXTRA_LDFLAGS $THREAD_LDFLAGS"
+WRAPPER_EXTRA_LIBS="$WRAPPER_EXTRA_LIBS $THREAD_LIBS"
 
 #
 # What is the local equivalent of "ln -s"
@@ -737,6 +749,7 @@ AC_CONFIG_FILES([
     src/mpi/proc/Makefile
     src/mpi/request/Makefile
     src/mpi/runtime/Makefile
+    src/mpi/win/Makefile
 
     src/mca/Makefile