Merge pull request #8130 from jsquyres/pr/4.1.x/in-space-no-one-hears-you-scream
v4.1.x: Check for spaces in prefix, srcdir, and builddir
Этот коммит содержится в:
Коммит
83f2ffae71
@ -83,9 +83,9 @@ m4_define([OPAL_GET_VERSION],[
|
|||||||
if test -d "$srcdir/.git" && test $git_happy -eq 1; then
|
if test -d "$srcdir/.git" && test $git_happy -eq 1; then
|
||||||
if test "$srcdir" != "`pwd`"; then
|
if test "$srcdir" != "`pwd`"; then
|
||||||
git_save_dir=`pwd`
|
git_save_dir=`pwd`
|
||||||
cd $srcdir
|
cd "$srcdir"
|
||||||
$2_REPO_REV=`git describe --tags --always`
|
$2_REPO_REV=`git describe --tags --always`
|
||||||
cd $git_save_dir
|
cd "$git_save_dir"
|
||||||
unset git_save_dir
|
unset git_save_dir
|
||||||
else
|
else
|
||||||
$2_REPO_REV=`git describe --tags --always`
|
$2_REPO_REV=`git describe --tags --always`
|
||||||
|
20
configure.ac
20
configure.ac
@ -111,6 +111,26 @@ AM_SILENT_RULES([yes])
|
|||||||
# Make configure depend on the VERSION file, since it's used in AC_INIT
|
# Make configure depend on the VERSION file, since it's used in AC_INIT
|
||||||
AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION'])
|
AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION'])
|
||||||
|
|
||||||
|
# Sanity checks
|
||||||
|
AC_DEFUN([OMPI_CHECK_DIR_FOR_SPACES],[
|
||||||
|
dir="$1"
|
||||||
|
article="$2"
|
||||||
|
label="$3"
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([directory of $label])
|
||||||
|
AC_MSG_RESULT([$dir])
|
||||||
|
AS_IF([test -n "`echo $dir | grep ' '`"],
|
||||||
|
[AC_MSG_WARN([This version of Open MPI does not support $article $label])
|
||||||
|
AC_MSG_WARN([with a path that contains spaces])
|
||||||
|
AC_MSG_ERROR([Cannot continue.])])
|
||||||
|
])
|
||||||
|
|
||||||
|
OMPI_CHECK_DIR_FOR_SPACES([$srcdir], [a], [source tree])
|
||||||
|
OMPI_CHECK_DIR_FOR_SPACES([`readlink -f $srcdir`], [an], [absolute source tree])
|
||||||
|
OMPI_CHECK_DIR_FOR_SPACES([`readlink -f .`], [a], [build tree])
|
||||||
|
OMPI_CHECK_DIR_FOR_SPACES([$prefix], [a], [prefix])
|
||||||
|
OMPI_CHECK_DIR_FOR_SPACES([`readlink -f $prefix`], [an], [absolute prefix])
|
||||||
|
|
||||||
opal_show_subtitle "Checking versions"
|
opal_show_subtitle "Checking versions"
|
||||||
|
|
||||||
# Get the version of OMPI that we are installing
|
# Get the version of OMPI that we are installing
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user