1
1

Fixes trac:2913. Ensure that OMPI_VERSION is tolerant of having spaces in

it (i.e., so that it doesn't screw up the ident version string).

This commit was SVN r26651.

The following Trac tickets were found above:
  Ticket 2913 --> https://svn.open-mpi.org/trac/ompi/ticket/2913
Этот коммит содержится в:
Jeff Squyres 2012-06-25 17:04:25 +00:00
родитель 654259154d
Коммит 11808852be

Просмотреть файл

@ -489,7 +489,16 @@ AC_ARG_WITH([ident-string],
if test "$with_ident_string" = "" -o "$with_ident_string" = "no"; then
with_ident_string="%VERSION%"
fi
with_ident_string="`echo $with_ident_string | sed -e 's/%VERSION%/'$OMPI_VERSION/`"
# This is complicated, because $OMPI_VERSION may have spaces in it.
# So put the whole sed expr in single quotes -- i.e., directly
# substitute %VERSION% for (not expanded) $OMPI_VERSION.
with_ident_string="`echo $with_ident_string | sed -e 's/%VERSION%/$OMPI_VERSION/'`"
# Now eval an echo of that so that the "$OMPI_VERSION" token is
# replaced with its value. Enclose the whole thing in "" so that it
# ends up as 1 token.
with_ident_string="`eval echo $with_ident_string`"
AC_DEFINE_UNQUOTED([OPAL_IDENT_STRING], ["$with_ident_string"],
[ident string for Open MPI])
AC_MSG_RESULT([$with_ident_string])