From 92adbc5d722449b07c67b8a0fa5a2bbc605aff7d Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Tue, 31 Jul 2012 18:12:24 +0000
Subject: [PATCH] Fix some problems with the Fortran wrapper compiler flags,
 particularly with respect to threading flags.

Before this change, the following scenario would fail (e.g., on Linux
with pthreads):

{{{
$ ./configure --disable-shared --enable-static ...
$ make clean install
$ cd examples
$ make clean all
}}}

Linking the Fortran examples would fail with missing pthread symbols.

This commit was SVN r26927.
---
 configure.ac                       | 2 +-
 opal/config/opal_config_threads.m4 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 435a69d6b1..de533a5b14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -936,7 +936,7 @@ LIBS="$LIBS $THREAD_LIBS"
 WRAPPER_EXTRA_CFLAGS="$WRAPPER_EXTRA_CFLAGS $THREAD_CFLAGS"
 m4_ifdef([project_ompi],
          [WRAPPER_EXTRA_CXXFLAGS="$WRAPPER_EXTRA_CXXFLAGS $THREAD_CXXFLAGS"
-          WRAPPER_EXTRA_FCFLAGS="$WRAPPER_EXTRA_FCFLAGS $THREAD_FFLAGS"])
+          WRAPPER_EXTRA_FCFLAGS="$WRAPPER_EXTRA_FCFLAGS $THREAD_FCFLAGS"])
 WRAPPER_EXTRA_LDFLAGS="$WRAPPER_EXTRA_LDFLAGS $THREAD_LDFLAGS"
 # no need to update WRAPPER_EXTRA_LIBS - we'll get it from LT later
 
diff --git a/opal/config/opal_config_threads.m4 b/opal/config/opal_config_threads.m4
index bf36d1c674..f7ef64db48 100644
--- a/opal/config/opal_config_threads.m4
+++ b/opal/config/opal_config_threads.m4
@@ -123,7 +123,7 @@ if test "$THREAD_TYPE" = "solaris"; then
     AC_DEFINE(OPAL_HAVE_POSIX_THREADS, 0)
 
     THREAD_CFLAGS="$STHREAD_CFLAGS"
-    THREAD_FFLAGS="$STHREAD_FFLAGS"
+    THREAD_FCFLAGS="$STHREAD_FCFLAGS"
     THREAD_CXXFLAGS="$STHREAD_CXXFLAGS"
     THREAD_CPPFLAGS="$STHREAD_CPPFLAGS"
     THREAD_CXXCPPFLAGS="$STHREAD_CXXCPPFLAGS"
@@ -134,7 +134,7 @@ elif test "$THREAD_TYPE" = "posix"; then
     AC_DEFINE(OPAL_HAVE_POSIX_THREADS, 1)
 
     THREAD_CFLAGS="$PTHREAD_CFLAGS"
-    THREAD_FFLAGS="$PTHREAD_FFLAGS"
+    THREAD_FCFLAGS="$PTHREAD_FCFLAGS"
     THREAD_CXXFLAGS="$PTHREAD_CXXFLAGS"
     THREAD_CPPFLAGS="$PTHREAD_CPPFLAGS"
     THREAD_CXXCPPFLAGS="$PTHREAD_CXXCPPFLAGS"
@@ -147,7 +147,7 @@ else
     AC_DEFINE(OPAL_HAVE_POSIX_THREADS, 0)
 
     TRHEAD_CFLAGS=
-    THREAD_FFLAGS=
+    THREAD_FCFLAGS=
     THREAD_CXXFLAGS=
     THREAD_CPPFLAGS=
     THREAD_CXXCPPFLAGS=