Skip to content

Commit 1a70e5b

Browse files
authored
Merge pull request #3617 from ggouaillardet/topic/f08_mpiext
fortran2008: fix mpiext example
2 parents 9324193 + 344f000 commit 1a70e5b

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

config/ompi_configure_options.m4

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dnl Copyright (c) 2009 Los Alamos National Security, LLC. All rights
1717
dnl reserved.
1818
dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
1919
dnl Copyright (c) 2013 Intel, Inc. All rights reserved.
20-
dnl Copyright (c) 2015-2016 Research Organization for Information Science
20+
dnl Copyright (c) 2015-2017 Research Organization for Information Science
2121
dnl and Technology (RIST). All rights reserved.
2222
dnl
2323
dnl $COPYRIGHT$
@@ -244,11 +244,7 @@ OMPI_BUILD_FORTRAN_F08_SUBARRAYS=0
244244
AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -lt $OMPI_FORTRAN_USEMPIF08_BINDINGS],
245245
[AC_MSG_RESULT([none (use mpi_f08 disabled)])],
246246
[AS_IF([test "$enable_mpi_f08_subarray_prototype" = "yes"],
247-
[OMPI_BUILD_FORTRAN_F08_SUBARRAYS=1
248-
AC_MSG_RESULT([extra crispy (subarray prototype)])
249-
AC_MSG_WARN([Sorry, the subarray prototype is no longer available])
250-
AC_MSG_WARN([Contact your favorite OMPI developer and ask for it to be re-enabled])
251-
AC_MSG_ERROR([Cannot continue])],
247+
[OMPI_BUILD_FORTRAN_F08_SUBARRAYS=1],
252248
[AC_MSG_RESULT([regular (no subarray support)])])
253249
])
254250
AC_DEFINE_UNQUOTED([OMPI_BUILD_FORTRAN_F08_SUBARRAYS],

config/ompi_ext.m4

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dnl University Research and Technology
55
dnl Corporation. All rights reserved.
66
dnl Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
77
dnl Copyright (c) 2011-2012 Oak Ridge National Labs. All rights reserved.
8-
dnl Copyright (c) 2015 Research Organization for Information Science
8+
dnl Copyright (c) 2015-2017 Research Organization for Information Science
99
dnl and Technology (RIST). All rights reserved.
1010
dnl Copyright (c) 2017 The University of Tennessee and The University
1111
dnl of Tennessee Research Foundation. All rights
@@ -216,8 +216,7 @@ EOF
216216

217217
# Only build this mpi_f08_ext module if we're building the "use
218218
# mpi_f08" module *and* it's the non-descriptor one.
219-
AS_IF([test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS && \
220-
test $OMPI_BUILD_FORTRAN_F08_SUBARRAYS -eq 0],
219+
AS_IF([test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS]
221220
[OMPI_BUILD_FORTRAN_USEMPIF08_EXT=1],
222221
[OMPI_BUILD_FORTRAN_USEMPIF08_EXT=0])
223222
AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPIF08_EXT,

0 commit comments

Comments
 (0)