From d57db7821694eb1170d5c32a32025f0e6c536fed Mon Sep 17 00:00:00 2001
From: Rainer Keller <rainer.keller@hft-stuttgart.de>
Date: Wed, 13 Jul 2016 11:23:07 +0200
Subject: [PATCH 1/2] Correct "configure --help" output and amend the default
 setting if user provides a wrong input value, like "runtime" (which works for
 MPI, but not for OSHMEM)

(cherry-picked from 997a00c06fdd7b6e0823bf1345463103047aa25c)
---
 config/oshmem_configure_options.m4 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/oshmem_configure_options.m4 b/config/oshmem_configure_options.m4
index 69d05b613e7..48ede73a544 100644
--- a/config/oshmem_configure_options.m4
+++ b/config/oshmem_configure_options.m4
@@ -73,7 +73,7 @@ AC_DEFINE_UNQUOTED([OSHMEM_SPEC_COMPAT], [$OSHMEM_SPEC_COMPAT],
 #
 AC_MSG_CHECKING([if want OSHMEM API parameter checking])
 AC_ARG_WITH(oshmem-param-check,
-    AC_HELP_STRING([--oshmem-param-check(=VALUE)],
+    AC_HELP_STRING([--with-oshmem-param-check(=VALUE)],
                    [behavior of OSHMEM API function parameter checking.  Valid values are: always, never.  If --with-oshmem-param-check is specified with no VALUE argument, it is equivalent to a VALUE of "always"; --without-oshmem-param-check is equivalent to "never" (default: always).]))
 if test "$enable_oshmem" != "no"; then
     if test "$with_oshmem_param_check" = "no" || \
@@ -86,10 +86,11 @@ if test "$enable_oshmem" != "no"; then
         shmem_param_check=1
         AC_MSG_RESULT([always])
     else
+        shmem_param_check=1
         AC_MSG_RESULT([unknown])
         AC_MSG_WARN([*** Unrecognized --with-oshmem-param-check value])
         AC_MSG_WARN([*** See "configure --help" output])
-        AC_MSG_WARN([*** Defaulting to "runtime"])
+        AC_MSG_WARN([*** Defaulting to "always"])
     fi
 else
     shmem_param_check=0

From 77214d6f4cc510986c78b3ebd5cfce3949ce1612 Mon Sep 17 00:00:00 2001
From: Rainer Keller <rainer.keller@hft-stuttgart.de>
Date: Wed, 13 Jul 2016 11:23:47 +0200
Subject: [PATCH 2/2] Fix missing include and missing MCA_SPML_CALL.

(cherry-picked from 3ec1b868d152f736d31132c730cdb3011538efde)
---
 oshmem/shmem/fortran/shmem_put_f.c    | 5 +++--
 oshmem/shmem/fortran/shmem_put_nb_f.c | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/oshmem/shmem/fortran/shmem_put_f.c b/oshmem/shmem/fortran/shmem_put_f.c
index 7681cfaf5e5..dc37627be6e 100644
--- a/oshmem/shmem/fortran/shmem_put_f.c
+++ b/oshmem/shmem/fortran/shmem_put_f.c
@@ -14,6 +14,7 @@
 #include "oshmem/include/shmem.h"
 #include "oshmem/shmem/shmem_api_logger.h"
 #include "oshmem/runtime/runtime.h"
+#include "oshmem/mca/spml/spml.h"
 #include "stdio.h"
 
 #if OSHMEM_PROFILING
@@ -32,9 +33,9 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
 
 void shmem_put_f(FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *length, MPI_Fint *pe)
 {
-    shmem_put(FPTR_2_VOID_PTR(target),
+    MCA_SPML_CALL(put(FPTR_2_VOID_PTR(target),
         FPTR_2_VOID_PTR(source),
         OMPI_FINT_2_INT(*length),
-        OMPI_FINT_2_INT(*pe));
+        OMPI_FINT_2_INT(*pe)));
 }
 
diff --git a/oshmem/shmem/fortran/shmem_put_nb_f.c b/oshmem/shmem/fortran/shmem_put_nb_f.c
index 3acff9c118a..acfb22dc1f5 100644
--- a/oshmem/shmem/fortran/shmem_put_nb_f.c
+++ b/oshmem/shmem/fortran/shmem_put_nb_f.c
@@ -13,6 +13,7 @@
 #include "oshmem/include/shmem.h"
 #include "oshmem/shmem/shmem_api_logger.h"
 #include "oshmem/runtime/runtime.h"
+#include "oshmem/mca/spml/spml.h"
 #include "ompi/datatype/ompi_datatype.h"
 #include "stdio.h"