Skip to content

Commit f230304

Browse files
committed
configiry: use slightly better AC_MSG strings
Use strings/names that are meaningful to the end user, not just to the Open MPI developer. Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
1 parent c4d9812 commit f230304

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

config/ompi_configure_options.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dnl $HEADER$
2828
dnl
2929

3030
AC_DEFUN([OMPI_CONFIGURE_OPTIONS],[
31-
opal_show_subtitle "OMPI Configuration options"
31+
opal_show_subtitle "MPI layer configuration options"
3232

3333
#
3434
# Disable MPI layer?
@@ -231,7 +231,7 @@ AC_DEFINE_UNQUOTED(MPI_PARAM_CHECK, $mpi_param_check,
231231
AC_DEFINE_UNQUOTED(OMPI_PARAM_CHECK, $ompi_param_check,
232232
[Whether we want to check MPI parameters never or possible (an integer constant)])
233233

234-
AC_MSG_CHECKING([if want ompio support])
234+
AC_MSG_CHECKING([if want OMPIO support])
235235
AC_ARG_ENABLE([io-ompio],
236236
[AS_HELP_STRING([--disable-io-ompio],
237237
[Disable the ompio MPI-IO component])])

config/opal_configure_options.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dnl $HEADER$
3232
dnl
3333

3434
AC_DEFUN([OPAL_CONFIGURE_OPTIONS],[
35-
opal_show_subtitle "OPAL Configuration options"
35+
opal_show_subtitle "General configuration options"
3636

3737

3838
#

config/oshmem_configure_options.m4

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ dnl $HEADER$
1616
dnl
1717

1818
AC_DEFUN([OSHMEM_CONFIGURE_OPTIONS],[
19-
opal_show_subtitle "OSHMEM Configuration options"
19+
opal_show_subtitle "OpenSHMEM Configuration options"
2020

2121
AC_SUBST(OSHMEM_LIBSHMEM_EXTRA_LIBS)
2222
AC_SUBST(OSHMEM_LIBSHMEM_EXTRA_LDFLAGS)
2323

2424
#
2525
# Disable Open SHMEM?
2626
#
27-
AC_MSG_CHECKING([if want oshmem])
27+
AC_MSG_CHECKING([if want OpenSHMEM])
2828
AC_ARG_ENABLE([oshmem],
2929
[AS_HELP_STRING([--enable-oshmem],
3030
[Enable building the OpenSHMEM interface (available on Linux only, where it is enabled by default)])])
@@ -76,7 +76,7 @@ AC_DEFINE_UNQUOTED([OSHMEM_SPEC_COMPAT], [$OSHMEM_SPEC_COMPAT],
7676
#
7777
# Do we want to disable OSHMEM parameter checking at run-time?
7878
#
79-
AC_MSG_CHECKING([if want OSHMEM API parameter checking])
79+
AC_MSG_CHECKING([if want OpenSHMEM API parameter checking])
8080
AC_ARG_WITH([oshmem-param-check],
8181
[AS_HELP_STRING([--with-oshmem-param-check(=VALUE)],
8282
[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).])])
@@ -104,7 +104,7 @@ AC_DEFINE_UNQUOTED(OSHMEM_PARAM_CHECK, $shmem_param_check,
104104
#
105105
AC_ARG_ENABLE([oshmem-profile],
106106
[AS_HELP_STRING([--enable-oshmem-profile],
107-
[enable OSHMEM profiling (default: enabled)])])
107+
[enable OpenSHMEM profiling (default: enabled)])])
108108
AC_MSG_CHECKING([if want pshmem])
109109
AS_IF([test "$enable_oshmem_profile" != "no"],
110110
[AC_MSG_RESULT([yes])],
@@ -123,17 +123,17 @@ AS_IF([test "$enable_oshmem" = "no" && \
123123
#
124124
# Fortran bindings
125125
#
126-
AC_MSG_CHECKING([if want to build OSHMEM fortran bindings])
126+
AC_MSG_CHECKING([if want to build OpenSHMEM fortran bindings])
127127
AC_ARG_ENABLE([oshmem-fortran],
128128
AS_HELP_STRING([--enable-oshmem-fortran],
129-
[enable OSHMEM Fortran bindings (default: enabled if Fortran compiler found)]))
129+
[enable OpenSHMEM Fortran bindings (default: enabled if Fortran compiler found)]))
130130
if test "$enable_oshmem_fortran" != "no"; then
131131
# If no OMPI FORTRAN, bail
132132
AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -eq $OMPI_FORTRAN_NO_BINDINGS && \
133133
test "$enable_oshmem_fortran" = "yes"],
134134
[AC_MSG_RESULT([bad value OMPI_TRY_FORTRAN_BINDINGS: ($OMPI_TRY_FORTRAN_BINDINGS)])
135135
AC_MSG_WARN([Your request to --enable-oshmem-fortran can only be satisfied if fortran support is enabled in OMPI.
136-
You see this message because OMPI fortran support has been explicitly disabled via --disable-mpi-fortran and OSHMEM fortran support was explicitly enabled with --enable-oshmem-fortran.
136+
You see this message because MPI fortran support has been explicitly disabled via --disable-mpi-fortran and OpenSHMEM fortran support was explicitly enabled with --enable-oshmem-fortran.
137137
Configure will abort because you, a human, have asked for something that cannot be provided.])
138138
AC_MSG_ERROR([Cannot continue])])
139139
if test $OMPI_TRY_FORTRAN_BINDINGS -gt $OMPI_FORTRAN_NO_BINDINGS; then

0 commit comments

Comments
 (0)