From 33d363e65d2cc9cee381d5f87be1b4ad097823df Mon Sep 17 00:00:00 2001
From: Mike Dubman <miked@mellanox.com>
Date: Mon, 3 Mar 2014 09:58:11 +0000
Subject: [PATCH] OSHMEM: fix fortran binding

based on true story: http://www.open-mpi.org/community/lists/devel/2014/03/14262.php

fixed by Roman, reviewed by Igor/Mike

cmr=v1.7.5:reviewer=ompi-rm1.7

This commit was SVN r30906.
---
 config/oshmem_configure_options.m4 | 2 +-
 configure.ac                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/oshmem_configure_options.m4 b/config/oshmem_configure_options.m4
index 77615fb161..2cfd803e2a 100644
--- a/config/oshmem_configure_options.m4
+++ b/config/oshmem_configure_options.m4
@@ -93,7 +93,7 @@ AC_MSG_CHECKING([if want to build OSHMEM fortran bindings])
 AC_ARG_ENABLE(oshmem-fortran,
 AC_HELP_STRING([--enable-oshmem-fortran],
                [enable OSHMEM Fortran bindings (default: enabled if Fortran compiler found)]))
-if test "$enable_oshmem_fortran" != "no" -a "$ompi_fortran_happy" = 1; then
+if test "$enable_oshmem_fortran" != "no"; then
 # If no OMPI FORTRAN, bail
    AS_IF([test $OMPI_WANT_FORTRAN_BINDINGS -eq 0 -a "$enable_oshmem" != "no"],
                [AC_MSG_RESULT([bad value OMPI_WANT_FORTRAN_BINDINGS: ($OMPI_WANT_FORTRAN_BINDINGS)])
diff --git a/configure.ac b/configure.ac
index 895aa2473a..2969f76965 100644
--- a/configure.ac
+++ b/configure.ac
@@ -605,7 +605,7 @@ m4_ifdef([project_ompi], [OMPI_SETUP_MPI_FORTRAN], [ompi_fortran_happy=0])
 AM_CONDITIONAL(OSHMEM_BUILD_FORTRAN_BINDINGS,
     [test "$ompi_fortran_happy" == "1" -a \
           "$OMPI_WANT_FORTRAN_BINDINGS" == "1" -a \
-          "$oshmem_fortran_enable" != "no"])
+          "$enable_oshmem_fortran" != "no"])
 
 # checkpoint results
 AC_CACHE_SAVE