* ROMIO requires AC 2.59, so bump up the top level AC requirements to match.
* Abort the top-level autogen.sh if any of the sub-autogen.sh scripts fail, or one can end up with a really whacky build tree This does not require anyone re-running autogen or configure. You'll just get slightly more error checking goodness next time I do something that requires you to re-run autogen.sh ;). This commit was SVN r8947.
Этот коммит содержится в:
родитель
269fc0c13a
Коммит
4767843235
31
autogen.sh
31
autogen.sh
@ -54,7 +54,7 @@ if test ! -z "$AUTOMAKE"; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
ompi_automake_version="1.9"
|
ompi_automake_version="1.9"
|
||||||
ompi_autoconf_version="2.58"
|
ompi_autoconf_version="2.59"
|
||||||
ompi_libtool_version="1.5.16"
|
ompi_libtool_version="1.5.16"
|
||||||
|
|
||||||
|
|
||||||
@ -658,6 +658,10 @@ EOF
|
|||||||
|
|
||||||
EOF
|
EOF
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
|
if test ! $? -eq 0 ; then
|
||||||
|
echo "Error running autogen.sh -l in `pwd`. Aborting."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
elif test -f configure.params -a -f configure.m4 ; then
|
elif test -f configure.params -a -f configure.m4 ; then
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
|
|
||||||
@ -741,6 +745,10 @@ EOF
|
|||||||
echo "*** (started in $pd_subdir_start_dir)"
|
echo "*** (started in $pd_subdir_start_dir)"
|
||||||
cd "$dir"
|
cd "$dir"
|
||||||
$pd_ompi_topdir/autogen.sh -l
|
$pd_ompi_topdir/autogen.sh -l
|
||||||
|
if test ! $? -eq 0 ; then
|
||||||
|
echo "Error running autogen.sh -l in $dir. Aborting."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
cd "$pd_subdir_start_dir"
|
cd "$pd_subdir_start_dir"
|
||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
@ -1066,20 +1074,19 @@ EOF
|
|||||||
sleep 5
|
sleep 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# locations to look for mca modules
|
|
||||||
config_project_list="opal orte ompi"
|
|
||||||
if test "$no_ompi" = "1" ; then
|
|
||||||
config_project_list="opal orte"
|
|
||||||
fi
|
|
||||||
if test "$no_orte" = "1" ; then
|
|
||||||
config_project_list="opal"
|
|
||||||
fi
|
|
||||||
echo "Configuring projects: $config_project_list"
|
|
||||||
|
|
||||||
# figure out if we're at the top level of the OMPI tree, a component's
|
# figure out if we're at the top level of the OMPI tree, a component's
|
||||||
# top-level directory, or somewhere else.
|
# top-level directory, or somewhere else.
|
||||||
if test -f VERSION -a -f configure.ac -a -f include/mpi.h.in ; then
|
if test -f VERSION -a -f configure.ac -a -f include/mpi.h.in ; then
|
||||||
|
# locations to look for mca modules
|
||||||
|
config_project_list="opal orte ompi"
|
||||||
|
if test "$no_ompi" = "1" ; then
|
||||||
|
config_project_list="opal orte"
|
||||||
|
fi
|
||||||
|
if test "$no_orte" = "1" ; then
|
||||||
|
config_project_list="opal"
|
||||||
|
fi
|
||||||
|
echo "Configuring projects: $config_project_list"
|
||||||
|
|
||||||
# Top level of OMPI tree
|
# Top level of OMPI tree
|
||||||
ompidir="`pwd`"
|
ompidir="`pwd`"
|
||||||
elif test -f configure.in -o -f configure.ac -o -f configure.params ; then
|
elif test -f configure.in -o -f configure.ac -o -f configure.params ; then
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user