disable MPI library, use LAM only

This commit is contained in:
Vitor Santos Costa 2013-04-07 00:00:02 +01:00
parent 633a56647e
commit 537efbc341
2 changed files with 10 additions and 10 deletions

10
configure vendored
View File

@ -1539,7 +1539,7 @@ Optional Packages:
--with-java=JAVA_HOME use Java instalation in JAVA_HOME --with-java=JAVA_HOME use Java instalation in JAVA_HOME
--with-readline=DIR use GNU Readline Library in DIR --with-readline=DIR use GNU Readline Library in DIR
--with-matlab=DIR use MATLAB package in DIR --with-matlab=DIR use MATLAB package in DIR
--with-mpi=DIR use MPI library in DIR --with-mpi=DIR use LAM/MPI library in DIR
--with-mpe=DIR use MPE library in DIR --with-mpe=DIR use MPE library in DIR
--with-lam=DIR use LAM MPI library in DIR --with-lam=DIR use LAM MPI library in DIR
--with-heap-space=space default heap size in Kbytes --with-heap-space=space default heap size in Kbytes
@ -4860,16 +4860,16 @@ fi
# Check whether --with-mpi was given. # Check whether --with-mpi was given.
if test "${with_mpi+set}" = set; then : if test "${with_mpi+set}" = set; then :
withval=$with_mpi; if test "$withval" = yes; then withval=$with_mpi; if test "$withval" = yes; then
yap_cv_mpi=yes yap_cv_lam=yes
elif test "$withval" = no; then elif test "$withval" = no; then
yap_cv_mpi=no yap_cv_lam=no
else else
yap_cv_mpi=$with_mpi yap_cv_lam=$with_mpi
LDFLAGS="$LDFLAGS -L${yap_cv_mpi}/lib" LDFLAGS="$LDFLAGS -L${yap_cv_mpi}/lib"
CPPFLAGS="$CPPFLAGS -I${yap_cv_mpi}/include" CPPFLAGS="$CPPFLAGS -I${yap_cv_mpi}/include"
fi fi
else else
yap_cv_mpi=no yap_cv_lam=no
fi fi

View File

@ -360,18 +360,18 @@ AC_ARG_WITH(matlab,
[yap_cv_matlab=no]) [yap_cv_matlab=no])
AC_ARG_WITH(mpi, AC_ARG_WITH(mpi,
[ --with-mpi[=DIR] use MPI library in DIR], [ --with-mpi[=DIR] use LAM/MPI library in DIR],
if test "$withval" = yes; then if test "$withval" = yes; then
dnl handle UBUNTU systems dnl handle UBUNTU systems
yap_cv_mpi=yes yap_cv_lam=yes
elif test "$withval" = no; then elif test "$withval" = no; then
yap_cv_mpi=no yap_cv_lam=no
else else
yap_cv_mpi=$with_mpi yap_cv_lam=$with_mpi
LDFLAGS="$LDFLAGS -L${yap_cv_mpi}/lib" LDFLAGS="$LDFLAGS -L${yap_cv_mpi}/lib"
CPPFLAGS="$CPPFLAGS -I${yap_cv_mpi}/include" CPPFLAGS="$CPPFLAGS -I${yap_cv_mpi}/include"
fi, fi,
[yap_cv_mpi=no]) [yap_cv_lam=no])
AC_ARG_WITH(mpe, AC_ARG_WITH(mpe,