diff --git a/config/ompi_setup_cxx.m4 b/config/ompi_setup_cxx.m4
index 37757a6b7e..14b920bab2 100644
--- a/config/ompi_setup_cxx.m4
+++ b/config/ompi_setup_cxx.m4
@@ -214,11 +214,13 @@ AC_DEFUN([_OMPI_SETUP_CXX_COMPILER_BACKEND],[
         CXXFLAGS_orig="$CXXFLAGS"
         CXXFLAGS="$CXXFLAGS -finline-functions"
         add=
+        AC_LANG_PUSH(C++)
         AC_CACHE_CHECK([if $CXX supports -finline-functions],
                    [ompi_cv_cxx_finline_functions],
                    [AC_TRY_COMPILE([], [],
                                    [ompi_cv_cxx_finline_functions="yes"],
                                    [ompi_cv_cxx_finline_functions="no"])])
+        AC_LANG_POP(C++)
         if test "$ompi_cv_cxx_finline_functions" = "yes" ; then
             add=" -finline-functions"
         fi
diff --git a/config/opal_setup_cxx.m4 b/config/opal_setup_cxx.m4
index 9d1f59cbcd..43492198d8 100644
--- a/config/opal_setup_cxx.m4
+++ b/config/opal_setup_cxx.m4
@@ -152,11 +152,13 @@ AC_DEFUN([_OPAL_SETUP_CXX_COMPILER_BACKEND],[
         CXXFLAGS_orig="$CXXFLAGS"
         CXXFLAGS="$CXXFLAGS -finline-functions"
         add=
+        AC_LANG_PUSH(C++)
         AC_CACHE_CHECK([if $CXX supports -finline-functions],
                    [opal_cv_cxx_finline_functions],
                    [AC_TRY_COMPILE([], [],
                                    [opal_cv_cxx_finline_functions="yes"],
                                    [opal_cv_cxx_finline_functions="no"])])
+        AC_LANG_POP(C++)
         if test "$opal_cv_cxx_finline_functions" = "yes" ; then
             add=" -finline-functions"
         fi