Skip to content

Commit b4d44b4

Browse files
authored
Merge pull request #1193 from davidozog/pr/disable_fortran_by_default
configury: disable Fortran unless --enable-fortran
2 parents 5c52aa5 + 522a204 commit b4d44b4

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

configure.ac

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ AC_ARG_ENABLE([lengthy-tests],
200200
AM_CONDITIONAL([ENABLE_LENGTHY_TESTS], [test "$enable_lengthy_tests" = "yes"])
201201

202202
AC_ARG_ENABLE([fortran],
203-
[AS_HELP_STRING([--disable-fortran],
204-
[Disable building the Fortran bindings (default: enabled)])])
203+
[AS_HELP_STRING([--enable-fortran],
204+
[Enable building the Fortran bindings (default: disabled)])])
205205

206206
AC_ARG_ENABLE([cxx],
207207
[AS_HELP_STRING([--disable-cxx],
@@ -402,7 +402,7 @@ AC_PATH_PROG([M4], [m4], [false])
402402
AS_IF([test "$M4" = "false"],
403403
[AC_MSG_ERROR([Could not find 'm4' macro processor])])
404404

405-
if test "$enable_fortran" != "no" ; then
405+
if test "$enable_fortran" = "yes" ; then
406406
AC_PROG_FC
407407
else
408408
FC=
@@ -1001,17 +1001,17 @@ AS_IF([test -z "$num_transports"],
10011001
AS_IF([test "$shmem_cv_c11_works" != "yes"],
10021002
[AC_MSG_WARN([C compiler does not support _Generic, unable to verify and test C11 bindings])])
10031003

1004-
AS_IF([test "$enable_c11_checks" == "no"],
1004+
AS_IF([test "$enable_c11_checks" = "no"],
10051005
[AC_MSG_WARN([C11 _Generic type checks disabled, not verifying type coverage of C11 bindings])])
10061006

1007-
AS_IF([test "$enable_cxx" == "no"],
1007+
AS_IF([test "$enable_cxx" = "no"],
10081008
[AC_MSG_WARN([No C++ compiler or C++ disabled, unable to verify and test C++ bindings])])
10091009

1010-
AS_IF([test "$enable_fortran" == "no"],
1011-
[AC_MSG_WARN([No Fortran compiler or Fortran disabled, unable to test Fortran bindings])])
1010+
AS_IF([test "$enable_fortran" = "yes" -a "$FC" = ""],
1011+
[AC_MSG_ERROR([Fortran requested but no compiler is available])])
10121012

1013-
AS_IF([test "$enable_fortran" != "no"],
1014-
[AC_MSG_WARN([Fortran bindings have been deprecated as of OpenSHMEM v1.4])])
1013+
AS_IF([test "$enable_fortran" = "yes"],
1014+
[AC_MSG_WARN([The Fortran API was deprecated in OpenSHMEM v1.4 and removed in OpenSHMEM v1.5])])
10151015

10161016
FORT="$FC"
10171017
if test "$FORT" = "" ; then

0 commit comments

Comments
 (0)