diff --git a/config/ompi_check_libfca.m4 b/config/ompi_check_libfca.m4 index 073ba3d79e..058464b420 100644 --- a/config/ompi_check_libfca.m4 +++ b/config/ompi_check_libfca.m4 @@ -1,14 +1,15 @@ -# -*- shell-script -*- -# -# Copyright (c) 2011 Mellanox Technologies. All rights reserved. - -# Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# +dnl -*- shell-script -*- +dnl +dnl Copyright (c) 2011 Mellanox Technologies. All rights reserved. +dnl Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. +dnl $COPYRIGHT$ +dnl +dnl Additional copyrights may follow +dnl +dnl $HEADER$ +dnl # OMPI_CHECK_FCA(prefix, [action-if-found], [action-if-not-found]) # -------------------------------------------------------- @@ -24,7 +25,7 @@ AC_DEFUN([OMPI_CHECK_FCA],[ OPAL_CHECK_WITHDIR([fca], [$with_fca], [lib/libfca.so]) AS_IF([test "$with_fca" != "no"], - [AS_IF([test ! -z "$with_fca" -a "$with_fca" != "yes"], + [AS_IF([test ! -z "$with_fca" && test "$with_fca" != "yes"], [ompi_check_fca_dir=$with_fca ompi_check_fca_libdir="$ompi_check_fca_dir/lib" ompi_check_fca_incdir="$ompi_check_fca_dir/include" @@ -60,13 +61,13 @@ AC_DEFUN([OMPI_CHECK_FCA],[ [ompi_check_fca_happy="no"]) ]) - AS_IF([test "$ompi_check_fca_happy" = "yes" -a "$enable_progress_threads" = "yes"], + AS_IF([test "$ompi_check_fca_happy" = "yes" && test "$enable_progress_threads" = "yes"], [AC_MSG_WARN([fca driver does not currently support progress threads. Disabling FCA.]) ompi_check_fca_happy="no"]) AS_IF([test "$ompi_check_fca_happy" = "yes"], [$2], - [AS_IF([test ! -z "$with_fca" -a "$with_fca" != "no"], + [AS_IF([test ! -z "$with_fca" && test "$with_fca" != "no"], [AC_MSG_ERROR([FCA support requested but not found. Aborting])]) $3]) diff --git a/config/ompi_check_libhcoll.m4 b/config/ompi_check_libhcoll.m4 index 6697789a0c..165e517762 100644 --- a/config/ompi_check_libhcoll.m4 +++ b/config/ompi_check_libhcoll.m4 @@ -1,13 +1,15 @@ -# -*- shell-script -*- -# -# Copyright (c) 2011 Mellanox Technologies. All rights reserved. -# Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# +dnl -*- shell-script -*- +dnl +dnl Copyright (c) 2011 Mellanox Technologies. All rights reserved. +dnl Copyright (c) 2013 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. +dnl $COPYRIGHT$ +dnl +dnl Additional copyrights may follow +dnl +dnl $HEADER$ +dnl # OMPI_CHECK_HCOLL(prefix, [action-if-found], [action-if-not-found]) # -------------------------------------------------------- @@ -23,7 +25,7 @@ AC_DEFUN([OMPI_CHECK_HCOLL],[ OPAL_CHECK_WITHDIR([hcoll], [$with_hcoll], [lib/libhcoll.so]) AS_IF([test "$with_hcoll" != "no"], - [AS_IF([test ! -z "$with_hcoll" -a "$with_hcoll" != "yes"], + [AS_IF([test ! -z "$with_hcoll" && test "$with_hcoll" != "yes"], [ompi_check_hcoll_dir=$with_hcoll ompi_check_hcoll_libdir="$ompi_check_hcoll_dir/lib" ompi_check_hcoll_incdir="$ompi_check_hcoll_dir/include" @@ -62,13 +64,13 @@ AC_DEFUN([OMPI_CHECK_HCOLL],[ - AS_IF([test "$ompi_check_hcoll_happy" = "yes" -a "$enable_progress_threads" = "yes"], + AS_IF([test "$ompi_check_hcoll_happy" = "yes" && test "$enable_progress_threads" = "yes"], [AC_MSG_WARN([hcoll driver does not currently support progress threads. Disabling HCOLL.]) ompi_check_hcoll_happy="no"]) AS_IF([test "$ompi_check_hcoll_happy" = "yes"], [$2], - [AS_IF([test ! -z "$with_hcoll" -a "$with_hcoll" != "no"], + [AS_IF([test ! -z "$with_hcoll" && test "$with_hcoll" != "no"], [AC_MSG_ERROR([HCOLL support requested but not found. Aborting])]) $3]) diff --git a/config/ompi_check_lustre.m4 b/config/ompi_check_lustre.m4 index 82cc0d533c..d089b9007a 100644 --- a/config/ompi_check_lustre.m4 +++ b/config/ompi_check_lustre.m4 @@ -1,23 +1,25 @@ -# -*- shell-script -*- -# -# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana -# University Research and Technology -# Corporation. All rights reserved. -# Copyright (c) 2004-2005 The University of Tennessee and The University -# of Tennessee Research Foundation. All rights -# reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. -# Copyright (c) 2004-2006 The Regents of the University of California. -# All rights reserved. -# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2008-2012 University of Houston. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# +dnl -*- shell-script -*- +dnl +dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana +dnl University Research and Technology +dnl Corporation. All rights reserved. +dnl Copyright (c) 2004-2005 The University of Tennessee and The University +dnl of Tennessee Research Foundation. All rights +dnl reserved. +dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +dnl University of Stuttgart. All rights reserved. +dnl Copyright (c) 2004-2006 The Regents of the University of California. +dnl All rights reserved. +dnl Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2008-2012 University of Houston. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. +dnl $COPYRIGHT$ +dnl +dnl Additional copyrights may follow +dnl +dnl $HEADER$ +dnl # OMPI_CHECK_LUSTRE(prefix, [action-if-found], [action-if-not-found]) # -------------------------------------------------------- @@ -61,7 +63,7 @@ AC_DEFUN([OMPI_CHECK_LUSTRE],[ AS_IF([test "$ompi_check_lustre_happy" = "yes"], [$2], - [AS_IF([test ! -z "$with_lustre" -a "$with_lustre" != "no"], + [AS_IF([test ! -z "$with_lustre" && test "$with_lustre" != "no"], [echo LUSTRE support not found]) $3]) ]) diff --git a/config/ompi_check_mxm.m4 b/config/ompi_check_mxm.m4 index 00e9a7289c..2ead7f9934 100644 --- a/config/ompi_check_mxm.m4 +++ b/config/ompi_check_mxm.m4 @@ -1,12 +1,14 @@ -# -*- shell-script -*- -# -# Copyright (C) Mellanox Technologies Ltd. 2001-2011. ALL RIGHTS RESERVED. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# +dnl -*- shell-script -*- +dnl +dnl Copyright (c) 2001-2011 Mellanox Technologies Ltd. ALL RIGHTS RESERVED. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. +dnl $COPYRIGHT$ +dnl +dnl Additional copyrights may follow +dnl +dnl $HEADER$ +dnl # OMPI_CHECK_MXM(prefix, [action-if-found], [action-if-not-found]) # -------------------------------------------------------- @@ -28,12 +30,12 @@ AC_DEFUN([OMPI_CHECK_MXM],[ ompi_check_mxm_$1_save_LIBS="$LIBS" AS_IF([test "$with_mxm" != "no"], - [AS_IF([test ! -z "$with_mxm" -a "$with_mxm" != "yes"], + [AS_IF([test ! -z "$with_mxm" && test "$with_mxm" != "yes"], [ ompi_check_mxm_dir="$with_mxm" ompi_check_mxm_libdir="$with_mxm/lib" ]) - AS_IF([test ! -z "$with_mxm_libdir" -a "$with_mxm_libdir" != "yes"], + AS_IF([test ! -z "$with_mxm_libdir" && test "$with_mxm_libdir" != "yes"], [ompi_check_mxm_libdir="$with_mxm_libdir"]) ompi_check_mxm_extra_libs="-L$ompi_check_mxm_libdir" @@ -80,7 +82,7 @@ AC_DEFUN([OMPI_CHECK_MXM],[ AS_IF([test "$ompi_check_mxm_happy" = "yes"], [$2], - [AS_IF([test ! -z "$with_mxm" -a "$with_mxm" != "no"], + [AS_IF([test ! -z "$with_mxm" && test "$with_mxm" != "no"], [AC_MSG_ERROR([MXM support requested but not found. Aborting])]) $3]) ]) diff --git a/config/ompi_check_plfs.m4 b/config/ompi_check_plfs.m4 index bf9b8030db..aced3f4c36 100644 --- a/config/ompi_check_plfs.m4 +++ b/config/ompi_check_plfs.m4 @@ -1,23 +1,25 @@ -# -*- shell-script -*- -# -# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana -# University Research and Technology -# Corporation. All rights reserved. -# Copyright (c) 2004-2005 The University of Tennessee and The University -# of Tennessee Research Foundation. All rights -# reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. -# Copyright (c) 2004-2006 The Regents of the University of California. -# All rights reserved. -# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2008-2012 University of Houston. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# +dnl -*- shell-script -*- +dnl +dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana +dnl University Research and Technology +dnl Corporation. All rights reserved. +dnl Copyright (c) 2004-2005 The University of Tennessee and The University +dnl of Tennessee Research Foundation. All rights +dnl reserved. +dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +dnl University of Stuttgart. All rights reserved. +dnl Copyright (c) 2004-2006 The Regents of the University of California. +dnl All rights reserved. +dnl Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2008-2012 University of Houston. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. +dnl $COPYRIGHT$ +dnl +dnl Additional copyrights may follow +dnl +dnl $HEADER$ +dnl # OMPI_CHECK_PLFS(prefix, [action-if-found], [action-if-not-found]) # -------------------------------------------------------- @@ -101,7 +103,7 @@ AC_DEFUN([OMPI_CHECK_PLFS],[ LIBS="$check_plfs_save_LIBS" AS_IF([test "$ompi_check_plfs_happy" = "yes"], [$2], - [AS_IF([test ! -z "$with_plfs" -a "$with_plfs" != "no"], + [AS_IF([test ! -z "$with_plfs" && test "$with_plfs" != "no"], [echo PLFS support not found]) $3]) diff --git a/config/ompi_check_psm.m4 b/config/ompi_check_psm.m4 index 46f28dcb1e..7259354b6c 100644 --- a/config/ompi_check_psm.m4 +++ b/config/ompi_check_psm.m4 @@ -1,23 +1,25 @@ -# -*- shell-script -*- -# -# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana -# University Research and Technology -# Corporation. All rights reserved. -# Copyright (c) 2004-2005 The University of Tennessee and The University -# of Tennessee Research Foundation. All rights -# reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. -# Copyright (c) 2004-2006 The Regents of the University of California. -# All rights reserved. -# Copyright (c) 2006 QLogic Corp. All rights reserved. -# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# +dnl -*- shell-script -*- +dnl +dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana +dnl University Research and Technology +dnl Corporation. All rights reserved. +dnl Copyright (c) 2004-2005 The University of Tennessee and The University +dnl of Tennessee Research Foundation. All rights +dnl reserved. +dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +dnl University of Stuttgart. All rights reserved. +dnl Copyright (c) 2004-2006 The Regents of the University of California. +dnl All rights reserved. +dnl Copyright (c) 2006 QLogic Corp. All rights reserved. +dnl Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. +dnl $COPYRIGHT$ +dnl +dnl Additional copyrights may follow +dnl +dnl $HEADER$ +dnl # OMPI_CHECK_PSM(prefix, [action-if-found], [action-if-not-found]) # -------------------------------------------------------- @@ -39,9 +41,9 @@ AC_DEFUN([OMPI_CHECK_PSM],[ ompi_check_psm_$1_save_LIBS="$LIBS" AS_IF([test "$with_psm" != "no"], - [AS_IF([test ! -z "$with_psm" -a "$with_psm" != "yes"], + [AS_IF([test ! -z "$with_psm" && test "$with_psm" != "yes"], [ompi_check_psm_dir="$with_psm"]) - AS_IF([test ! -z "$with_psm_libdir" -a "$with_psm_libdir" != "yes"], + AS_IF([test ! -z "$with_psm_libdir" && test "$with_psm_libdir" != "yes"], [ompi_check_psm_libdir="$with_psm_libdir"]) OPAL_CHECK_PACKAGE([$1], @@ -59,13 +61,13 @@ AC_DEFUN([OMPI_CHECK_PSM],[ LDFLAGS="$ompi_check_psm_$1_save_LDFLAGS" LIBS="$ompi_check_psm_$1_save_LIBS" - AS_IF([test "$ompi_check_psm_happy" = "yes" -a "$enable_progress_threads" = "yes"], + AS_IF([test "$ompi_check_psm_happy" = "yes" && test "$enable_progress_threads" = "yes"], [AC_MSG_WARN([PSM driver does not currently support progress threads. Disabling BTL.]) ompi_check_psm_happy="no"]) AS_IF([test "$ompi_check_psm_happy" = "yes"], [$2], - [AS_IF([test ! -z "$with_psm" -a "$with_psm" != "no"], + [AS_IF([test ! -z "$with_psm" && test "$with_psm" != "no"], [AC_MSG_ERROR([PSM support requested but not found. Aborting])]) $3]) ]) diff --git a/config/ompi_check_pvfs2.m4 b/config/ompi_check_pvfs2.m4 index fe28d3dfef..618e145dde 100644 --- a/config/ompi_check_pvfs2.m4 +++ b/config/ompi_check_pvfs2.m4 @@ -1,23 +1,25 @@ -# -*- shell-script -*- -# -# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana -# University Research and Technology -# Corporation. All rights reserved. -# Copyright (c) 2004-2005 The University of Tennessee and The University -# of Tennessee Research Foundation. All rights -# reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. -# Copyright (c) 2004-2006 The Regents of the University of California. -# All rights reserved. -# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2008-2012 University of Houston. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# +dnl -*- shell-script -*- +dnl +dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana +dnl University Research and Technology +dnl Corporation. All rights reserved. +dnl Copyright (c) 2004-2005 The University of Tennessee and The University +dnl of Tennessee Research Foundation. All rights +dnl reserved. +dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +dnl University of Stuttgart. All rights reserved. +dnl Copyright (c) 2004-2006 The Regents of the University of California. +dnl All rights reserved. +dnl Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2008-2012 University of Houston. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. +dnl $COPYRIGHT$ +dnl +dnl Additional copyrights may follow +dnl +dnl $HEADER$ +dnl # OMPI_CHECK_PVFS2(prefix, [action-if-found], [action-if-not-found]) # -------------------------------------------------------- @@ -102,7 +104,7 @@ AC_DEFUN([OMPI_CHECK_PVFS2],[ LIBS="$check_pvfs2_save_LIBS" AS_IF([test "$ompi_check_pvfs2_happy" = "yes"], [$2], - [AS_IF([test ! -z "$with_pvfs2" -a "$with_pvfs2" != "no"], + [AS_IF([test ! -z "$with_pvfs2" && test "$with_pvfs2" != "no"], [echo PVFS2 support not found]) $3]) diff --git a/config/ompi_check_udapl.m4 b/config/ompi_check_udapl.m4 index 792e9093a5..02dac4649d 100644 --- a/config/ompi_check_udapl.m4 +++ b/config/ompi_check_udapl.m4 @@ -1,22 +1,24 @@ -# -*- shell-script -*- -# -# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana -# University Research and Technology -# Corporation. All rights reserved. -# Copyright (c) 2004-2005 The University of Tennessee and The University -# of Tennessee Research Foundation. All rights -# reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. -# Copyright (c) 2004-2005 The Regents of the University of California. -# All rights reserved. -# Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# +dnl -*- shell-script -*- +dnl +dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana +dnl University Research and Technology +dnl Corporation. All rights reserved. +dnl Copyright (c) 2004-2005 The University of Tennessee and The University +dnl of Tennessee Research Foundation. All rights +dnl reserved. +dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +dnl University of Stuttgart. All rights reserved. +dnl Copyright (c) 2004-2005 The Regents of the University of California. +dnl All rights reserved. +dnl Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. +dnl $COPYRIGHT$ +dnl +dnl Additional copyrights may follow +dnl +dnl $HEADER$ +dnl # OMPI_CHECK_UDAPL(prefix, [action-if-found], [action-if-not-found]) # -------------------------------------------------------- @@ -58,9 +60,9 @@ AC_DEFUN([OMPI_CHECK_UDAPL],[ ;; esac]) - AS_IF([test ! -z "$with_udapl" -a "$with_udapl" != "yes"], + AS_IF([test ! -z "$with_udapl" && test "$with_udapl" != "yes"], [ompi_check_udapl_dir="$with_udapl"]) - AS_IF([test ! -z "$with_udapl_libdir" -a "$with_udapl_libdir" != "yes"], + AS_IF([test ! -z "$with_udapl_libdir" && test "$with_udapl_libdir" != "yes"], [ompi_check_udapl_libdir="$with_udapl_libdir"]) AS_IF([test "$with_udapl" = "no"], [ompi_check_udapl_happy="no"], @@ -111,7 +113,7 @@ dnl out we need -ldapl to link (looks like udapl over GM). AS_IF([test "$ompi_check_udapl_happy" = "yes"], [$2], - [AS_IF([test ! -z "$with_udapl" -a "$with_udapl" != "no"], + [AS_IF([test ! -z "$with_udapl" && test "$with_udapl" != "no"], [AC_MSG_ERROR([uDAPL support requested but not found. Aborting])]) $3]) ]) diff --git a/config/ompi_configure_options.m4 b/config/ompi_configure_options.m4 index b66316c0c3..8378db0034 100644 --- a/config/ompi_configure_options.m4 +++ b/config/ompi_configure_options.m4 @@ -17,6 +17,8 @@ dnl Copyright (c) 2009 Los Alamos National Security, LLC. All rights dnl reserved. dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. dnl Copyright (c) 2013 Intel, Inc. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. dnl dnl $COPYRIGHT$ dnl @@ -159,9 +161,9 @@ case "x$enable_mpi_fortran" in ;; esac -AS_IF([test $OMPI_WANT_FORTRAN_MPIFH_BINDINGS -eq 1 -o \ - $OMPI_WANT_FORTRAN_USEMPI_BINDINGS -eq 1 -o \ - $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1], +AS_IF([test $OMPI_WANT_FORTRAN_MPIFH_BINDINGS -eq 1 || \ + test $OMPI_WANT_FORTRAN_USEMPI_BINDINGS -eq 1 || \ + test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1], [OMPI_WANT_FORTRAN_BINDINGS=1], [OMPI_WANT_FORTRAN_BINDINGS=0]) @@ -226,18 +228,18 @@ AC_ARG_WITH(mpi-param-check, AC_HELP_STRING([--with-mpi-param-check(=VALUE)], [behavior of MPI function parameter checking. Valid values are: always, never, runtime. If --with-mpi-param-check is specified with no VALUE argument, it is equivalent to a VALUE of "always"; --without-mpi-param-check is equivalent to "never" (default: runtime).])) mpi_param_check=ompi_mpi_param_check -if test "$with_mpi_param_check" = "no" -o \ - "$with_mpi_param_check" = "never"; then +if test "$with_mpi_param_check" = "no" || \ + test "$with_mpi_param_check" = "never"; then mpi_param_check=0 ompi_param_check=0 AC_MSG_RESULT([never]) -elif test "$with_mpi_param_check" = "yes" -o \ - "$with_mpi_param_check" = "always"; then +elif test "$with_mpi_param_check" = "yes" || \ + test "$with_mpi_param_check" = "always"; then mpi_param_check=1 ompi_param_check=1 AC_MSG_RESULT([always]) -elif test "$with_mpi_param_check" = "runtime" -o \ - -z "$with_mpi_params_check"; then +elif test "$with_mpi_param_check" = "runtime" || \ + test -z "$with_mpi_params_check"; then ompi_param_check=1 AC_MSG_RESULT([runtime]) else diff --git a/config/ompi_contrib.m4 b/config/ompi_contrib.m4 index 80978f0656..e0d503a525 100644 --- a/config/ompi_contrib.m4 +++ b/config/ompi_contrib.m4 @@ -12,6 +12,8 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2007-2010 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -107,7 +109,7 @@ AC_DEFUN([_OMPI_CONTRIB_CONFIGURE],[ AS_IF([test "x$enable_$1" = xno], [DISABLE_contrib_$1=yes]) OMPI_CONTRIB_HAPPY=0 - if test "$DISABLE_contrib_$1" = "" -a "$DISABLE_contrib_all" = ""; then + if test "$DISABLE_contrib_$1" = "" && test "$DISABLE_contrib_all" = ""; then OMPI_contrib_$1_CONFIG([OMPI_CONTRIB_HAPPY=1], []) AC_MSG_CHECKING([if contributed component $1 can compile]) if test "$OMPI_CONTRIB_HAPPY" = "1"; then diff --git a/config/ompi_cxx_find_template_repository.m4 b/config/ompi_cxx_find_template_repository.m4 index fad19c63b6..cef8911e19 100644 --- a/config/ompi_cxx_find_template_repository.m4 +++ b/config/ompi_cxx_find_template_repository.m4 @@ -10,6 +10,8 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, dnl University of Stuttgart. All rights reserved. dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -127,7 +129,7 @@ else for ompi_file in `ls` do - if test "$ompi_file" != "." -a "$ompi_file" != ".."; then + if test "$ompi_file" != "." && test "$ompi_file" != ".."; then # Is it a directory? if test -d "$ompi_file"; then ompi_template_dir="$ompi_file $ompi_template_dir" @@ -137,7 +139,7 @@ else name="`echo $ompi_file | cut -d. -f1`" temp_mask= - if test "$name" = "main" -o "$name" = "other"; then + if test "$name" = "main" || test "$name" = "other"; then temp_mask="`echo $ompi_file | cut -d. -f2`" if test "$ompi_template_filemask" = ""; then ompi_template_filemask="$temp_mask"; diff --git a/config/ompi_endpoint_tag.m4 b/config/ompi_endpoint_tag.m4 index d7fc78e954..c47df147b9 100644 --- a/config/ompi_endpoint_tag.m4 +++ b/config/ompi_endpoint_tag.m4 @@ -1,12 +1,14 @@ -# -*- shell-script -*- -# -# Copyright (c) 2013 Sandia National Laboratories. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# +dnl -*- shell-script -*- +dnl +dnl Copyright (c) 2013 Sandia National Laboratories. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. +dnl $COPYRIGHT$ +dnl +dnl Additional copyrights may follow +dnl +dnl $HEADER$ +dnl AC_DEFUN([OMPI_REQUIRE_ENDPOINT_TAG_INIT], [ ompi_endpoint_tag_counter=0 @@ -38,7 +40,7 @@ dnl AS_IF([test "$enable_endpoint_information" != "no"], dnl [OMPI_REQUIRE_ENDPOINT_TAG(DYNAMIC)]) AC_MSG_CHECKING([for size of endpoint array]) - AS_IF([test -z "$ompi_endpoint_tag_counter" -o "$ompi_endpoint_tag_counter" = "0"], + AS_IF([test -z "$ompi_endpoint_tag_counter" || test "$ompi_endpoint_tag_counter" = "0"], [AC_MSG_ERROR([Endpoint index count is 0. This means no MPI communication would be possible. Aborting.])]) AC_MSG_RESULT([$ompi_endpoint_tag_counter]) AC_DEFINE_UNQUOTED([OMPI_PROC_ENDPOINT_TAG_MAX], [$ompi_endpoint_tag_counter], diff --git a/config/ompi_ext.m4 b/config/ompi_ext.m4 index c299816874..8828a13fd5 100644 --- a/config/ompi_ext.m4 +++ b/config/ompi_ext.m4 @@ -5,6 +5,8 @@ dnl University Research and Technology dnl Corporation. All rights reserved. dnl Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2011-2012 Oak Ridge National Labs. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -43,7 +45,7 @@ AC_DEFUN([OMPI_EXT],[ AC_MSG_RESULT([ompi_mpiext_list]) AC_MSG_CHECKING([which MPI extension should be enabled]) - if test "$enable_mpi_ext" = "yes" -o "$enable_mpi_ext" = "all"; then + if test "$enable_mpi_ext" = "yes" || test "$enable_mpi_ext" = "all"; then msg="All Extensions" str="`echo ENABLE_EXT_ALL=1`" eval $str @@ -171,8 +173,8 @@ EOF # Make an AM conditional to see whether we're building the mpi_ext # module. Note that we only build it if we support the ignore-tkr # mpi module. - AS_IF([test $OMPI_BUILD_FORTRAN_USEMPI_BINDINGS -eq 1 -a \ - $OMPI_FORTRAN_HAVE_IGNORE_TKR -eq 1], + AS_IF([test $OMPI_BUILD_FORTRAN_USEMPI_BINDINGS -eq 1 && \ + test $OMPI_FORTRAN_HAVE_IGNORE_TKR -eq 1], [OMPI_BUILD_FORTRAN_USEMPI_EXT=1], [OMPI_BUILD_FORTRAN_USEMPI_EXT=0]) AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPI_EXT, @@ -208,8 +210,8 @@ EOF # Only build this mpi_f08_ext module if we're building the "use # mpi_f08" module *and* it's the non-descriptor one. - AS_IF([test $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1 -a \ - $OMPI_BUILD_FORTRAN_F08_SUBARRAYS -eq 0], + AS_IF([test $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1 && \ + test $OMPI_BUILD_FORTRAN_F08_SUBARRAYS -eq 0], [OMPI_BUILD_FORTRAN_USEMPIF08_EXT=1], [OMPI_BUILD_FORTRAN_USEMPIF08_EXT=0]) AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPIF08_EXT, @@ -218,8 +220,8 @@ EOF # Make an AM conditional to see whether we're building either the # mpi_ext or mpi_f08_Ext modules. AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPI_OR_USEMPIF08_EXT, - [test $OMPI_BUILD_FORTRAN_USEMPI_EXT -eq 1 -o \ - $OMPI_BUILD_FORTRAN_USEMPIF08_EXT -eq 1]) + [test $OMPI_BUILD_FORTRAN_USEMPI_EXT -eq 1 || \ + test $OMPI_BUILD_FORTRAN_USEMPIF08_EXT -eq 1]) # # Process each component diff --git a/config/ompi_fortran_check.m4 b/config/ompi_fortran_check.m4 index 66658c3822..2bf5102611 100644 --- a/config/ompi_fortran_check.m4 +++ b/config/ompi_fortran_check.m4 @@ -11,6 +11,8 @@ dnl University of Stuttgart. All rights reserved. dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -67,7 +69,7 @@ AC_DEFUN([OMPI_FORTRAN_CHECK], [ # doesn't match the expected size, then the compiler doesn't # really support it. OMPI_FORTRAN_GET_SIZEOF([], [$1], [ofc_type_size]) - if test "$ofc_expected_size" != "-1" -a "$ofc_type_size" != "$ofc_expected_size"; then + if test "$ofc_expected_size" != "-1" && test "$ofc_type_size" != "$ofc_expected_size"; then AC_MSG_WARN([*** Fortran $1 does not have expected size!]) AC_MSG_WARN([*** Expected $ofc_expected_size, got $ofc_type_size]) AC_MSG_WARN([*** Disabling MPI support for Fortran $1]) @@ -175,7 +177,7 @@ AC_DEFUN([OMPI_FORTRAN_CHECK], [ AC_DEFINE_UNQUOTED([OMPI_KIND_FORTRAN_]m4_translit(m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]), [a-z], [A-Z]), [$ofc_type_kind], [Fortrn KIND number for $1]) - if test "$3" != "" -a "$ofc_define_type" = "yes"; then + if test "$3" != "" && test "$ofc_define_type" = "yes"; then AC_DEFINE_UNQUOTED([ompi_fortran_]m4_translit(m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]), [A-Z], [a-z])[_t], [$ofc_c_type], [C type corresponding to Fortran $1]) diff --git a/config/ompi_fortran_check_logical_array.m4 b/config/ompi_fortran_check_logical_array.m4 index 2bf6da91d6..c74227a0a0 100644 --- a/config/ompi_fortran_check_logical_array.m4 +++ b/config/ompi_fortran_check_logical_array.m4 @@ -9,6 +9,8 @@ dnl University of Stuttgart. All rights reserved. dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -22,7 +24,7 @@ AC_DEFUN([OMPI_FORTRAN_CHECK_LOGICAL_ARRAY],[ AC_CACHE_CHECK([for correct handling of Fortran logical arrays], logical_array_var, - [if test "$1" = "none" -o $OMPI_WANT_FORTRAN_BINDINGS -eq 0 -o $ompi_fortran_happy -eq 0; then + [if test "$1" = "none" || test $OMPI_WANT_FORTRAN_BINDINGS -eq 0 || test $ompi_fortran_happy -eq 0; then value=skipped else # Fortran module diff --git a/config/ompi_fortran_check_real16_c_equiv.m4 b/config/ompi_fortran_check_real16_c_equiv.m4 index fe097b25fe..545cfa45b2 100644 --- a/config/ompi_fortran_check_real16_c_equiv.m4 +++ b/config/ompi_fortran_check_real16_c_equiv.m4 @@ -12,6 +12,8 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2008-2013 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -29,7 +31,7 @@ AC_DEFUN([OMPI_FORTRAN_CHECK_REAL16_C_EQUIV],[ # We have to do this as a cache check for cross-compilation platforms AC_CACHE_CHECK([for C type matching bit representation of REAL*16], real16_matches_c_var, - [AS_IF([test "$OMPI_WANT_FORTRAN_BINDINGS" = "1" -a "$OMPI_HAVE_FORTRAN_REAL16" = "1"],[ + [AS_IF([test "$OMPI_WANT_FORTRAN_BINDINGS" = "1" && test "$OMPI_HAVE_FORTRAN_REAL16" = "1"],[ # AC_CACHE_CHECK automatically does its own AC_MSG_CHECKING, so close it out AC_MSG_RESULT([pending]) @@ -53,7 +55,7 @@ AC_DEFUN([OMPI_FORTRAN_CHECK_REAL16_C_EQUIV],[ [CFLAGS="$CFLAGS_save" AC_MSG_RESULT([does not work])]) ]) - AS_IF([test "$opal_cv_c_compiler_vendor" = "gnu" -a "$ac_cv_type___float128" = "yes"], + AS_IF([test "$opal_cv_c_compiler_vendor" = "gnu" && test "$ac_cv_type___float128" = "yes"], [AC_MSG_CHECKING([if gnu compiler __float128 == REAL*16]) OPAL_UNIQ([CFLAGS]) OMPI_FORTRAN_CHECK_REAL16_EQUIV_TYPE([__float128], [q]) @@ -136,7 +138,7 @@ EOF AS_IF([test "$happy" = "no"], [AC_MSG_RESULT([Could not determine if REAL*16 bit-matches C type])], # If it worked so far, try running to see what we get - [AS_IF([test "$happy" = "yes" -a "$cross_compiling" = "yes"], + [AS_IF([test "$happy" = "yes" && test "$cross_compiling" = "yes"], [AC_MSG_RESULT([Error!]) AC_MSG_ERROR([Can not determine if REAL*16 bit-matches C if cross compiling])], [OPAL_LOG_COMMAND([./conftest], diff --git a/config/ompi_fortran_find_ext_symbol_convention.m4 b/config/ompi_fortran_find_ext_symbol_convention.m4 index db7f3796d9..47300cdeb9 100644 --- a/config/ompi_fortran_find_ext_symbol_convention.m4 +++ b/config/ompi_fortran_find_ext_symbol_convention.m4 @@ -12,6 +12,8 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. dnl Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -32,7 +34,7 @@ AC_DEFUN([OMPI_FORTRAN_FIND_EXT_SYMBOL_CONVENTION], [ AC_CACHE_CHECK([$FORTRAN external symbol convention], [ompi_cv_fortran_external_symbol], - [if test "$FC" = "none" -o "$OMPI_WANT_FORTRAN_BINDINGS" = "0"; then + [if test "$FC" = "none" || test "$OMPI_WANT_FORTRAN_BINDINGS" = "0"; then ompi_cv_fortran_external_symbol="skipped" else cat >conftest.f <32 characters. OMPI_FORTRAN_HAVE_BIND_C_TYPE_NAME=0 - AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 -a \ - $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], + AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 && \ + test $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], [ # If we don't have TYPE, BIND(C, name="foo"), we won't build mpi_f08 at all OMPI_FORTRAN_CHECK_BIND_C_TYPE_NAME( [ # If we got here, we have all the required forms of @@ -411,8 +411,8 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[ # Fortran compiler doesn't support PROCEDURE in the way we # want/need, disable the mpi_f08 module. OMPI_FORTRAN_HAVE_PROCEDURE=0 - AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 -a \ - $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], + AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 && \ + test $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], [ # Does the compiler support "procedure" OMPI_FORTRAN_CHECK_PROCEDURE( [OMPI_FORTRAN_HAVE_PROCEDURE=1], @@ -420,8 +420,8 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[ OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS=0])]) OMPI_FORTRAN_HAVE_OPTIONAL_ARGS=0 - AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 -a \ - $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], + AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 && \ + test $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], [ # Does the compiler have optional arguments? OMPI_FORTRAN_CHECK_OPTIONAL_ARGS( [OMPI_FORTRAN_HAVE_OPTIONAL_ARGS=1], @@ -429,8 +429,8 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[ OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS=0])]) OMPI_FORTRAN_HAVE_C_FUNLOC=0 - AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 -a \ - $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], + AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 && \ + test $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], [ # Does the compiler supports c_funloc per # TS 29113 subclause 8.1 ? OMPI_FORTRAN_CHECK_C_FUNLOC( @@ -439,40 +439,40 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[ OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS=0])]) OMPI_FORTRAN_HAVE_PRIVATE=0 - AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 -a \ - $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], + AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 && \ + test $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], [ # Does the compiler support "private" OMPI_FORTRAN_CHECK_PRIVATE( [OMPI_FORTRAN_HAVE_PRIVATE=1], [OMPI_FORTRAN_HAVE_PRIVATE=0])]) OMPI_FORTRAN_HAVE_PROTECTED=0 - AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 -a \ - $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], + AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 && \ + test $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], [ # Does the compiler support "protected" OMPI_FORTRAN_CHECK_PROTECTED( [OMPI_FORTRAN_HAVE_PROTECTED=1], [OMPI_FORTRAN_HAVE_PROTECTED=0])]) OMPI_FORTRAN_HAVE_ABSTRACT=0 - AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 -a \ - $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], + AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 && \ + test $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], [ # Does the compiler support "abstract" OMPI_FORTRAN_CHECK_ABSTRACT( [OMPI_FORTRAN_HAVE_ABSTRACT=1], [OMPI_FORTRAN_HAVE_ABSTRACT=0])]) OMPI_FORTRAN_HAVE_ASYNCHRONOUS=0 - AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 -a \ - $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], + AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 && \ + test $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], [ # Does the compiler support "asynchronous" OMPI_FORTRAN_CHECK_ASYNCHRONOUS( [OMPI_FORTRAN_HAVE_ASYNCHRONOUS=1], [OMPI_FORTRAN_HAVE_ASYNCHRONOUS=0])]) OMPI_FORTRAN_F08_HANDLE_SIZE=4 - AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 -a \ - $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], + AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 && \ + test $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], [ # How big are derived types with a single INTEGER? OMPI_FORTRAN_GET_SIZEOF([type, BIND(C) :: test_mpi_handle integer :: MPI_VAL @@ -485,8 +485,8 @@ end type test_mpi_handle], OMPI_FORTRAN_F08_PREDECL='!' OMPI_FORTRAN_F08_TYPE=real OMPI_FORTRAN_HAVE_F08_ASSUMED_RANK=0 - AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 -a \ - $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], + AS_IF([test $OMPI_WANT_FORTRAN_USEMPIF08_BINDINGS -eq 1 && \ + test $OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS -eq 1], [ # Look for Fortran 2008 assumed rank syntax OMPI_FORTRAN_CHECK_F08_ASSUMED_RANK( [ # If we have assumed rank, we can build the use @@ -605,9 +605,11 @@ end type test_mpi_handle], # these layers need to be built or NOT AM_CONDITIONAL(BUILD_MPI_FORTRAN_MPIFH_BINDINGS_LAYER, - [test \( $WANT_MPI_PROFILING -eq 0 -o $OMPI_PROFILING_COMPILE_SEPARATELY -eq 1 \) -a $OMPI_BUILD_FORTRAN_MPIFH_BINDINGS -eq 1]) + [( test $WANT_MPI_PROFILING -eq 0 || test $OMPI_PROFILING_COMPILE_SEPARATELY -eq 1 ) && \ + test $OMPI_BUILD_FORTRAN_MPIFH_BINDINGS -eq 1]) AM_CONDITIONAL(BUILD_PMPI_FORTRAN_MPIFH_BINDINGS_LAYER, - [test $OMPI_BUILD_FORTRAN_MPIFH_BINDINGS -eq 1 -a $WANT_MPI_PROFILING -eq 1]) + [test $OMPI_BUILD_FORTRAN_MPIFH_BINDINGS -eq 1 && \ + test $WANT_MPI_PROFILING -eq 1]) AC_DEFINE_UNQUOTED(OMPI_BUILD_FORTRAN_MPIFH_BINDINGS, $OMPI_BUILD_FORTRAN_MPIFH_BINDINGS, [Whether we will build the MPI Fortran mpif.h bindings or not]) @@ -646,16 +648,16 @@ end type test_mpi_handle], # ompi/mpi/fortran/use-mpi*/Makefile.ams be safe, too. # True if we're building either "use mpi" bindings AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPI_BINDINGS, - [test $OMPI_BUILD_FORTRAN_USEMPI_BINDINGS -eq 1 -o \ - $OMPI_FORTRAN_HAVE_IGNORE_TKR -eq 1]) + [test $OMPI_BUILD_FORTRAN_USEMPI_BINDINGS -eq 1 || \ + test $OMPI_FORTRAN_HAVE_IGNORE_TKR -eq 1]) # True if we're building the old TKR-style bindings AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPI_TKR_BINDINGS, - [test $OMPI_BUILD_FORTRAN_USEMPI_BINDINGS -eq 1 -a \ - $OMPI_FORTRAN_HAVE_IGNORE_TKR -eq 0]) + [test $OMPI_BUILD_FORTRAN_USEMPI_BINDINGS -eq 1 && \ + test $OMPI_FORTRAN_HAVE_IGNORE_TKR -eq 0]) # True if we're building the new ignore-TKR-style bindings AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPI_IGNORE_TKR_BINDINGS, - [test $OMPI_BUILD_FORTRAN_USEMPI_BINDINGS -eq 1 -a \ - $OMPI_FORTRAN_HAVE_IGNORE_TKR -eq 1]) + [test $OMPI_BUILD_FORTRAN_USEMPI_BINDINGS -eq 1 && \ + test $OMPI_FORTRAN_HAVE_IGNORE_TKR -eq 1]) # ------------------- # use mpi_f08 final setup