Update configure with switches for app, ParadisEO, and tutorial.
Add ParadisEO/Lesson1 tutorial in build-process. minor fixes.
This commit is contained in:
parent
0a6e0c687c
commit
e388461a3b
16 changed files with 113 additions and 8 deletions
|
|
@ -1,8 +1,28 @@
|
|||
# AC_APPLICATIONS()
|
||||
#
|
||||
# Compile applications unless user requests not to do it.
|
||||
AC_DEFUN([AC_APPLICATIONS],[dnl
|
||||
AC_ARG_ENABLE([applications],[ --enable-applications build applications (default=yes)],
|
||||
[ case "${enableval}" in
|
||||
yes) applications=true ;;
|
||||
no) applications=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for applications option) ;;
|
||||
esac],
|
||||
[applications=true])
|
||||
if test "$applications" = "true"; then
|
||||
AM_CONDITIONAL([USE_APPLICATIONS], true)
|
||||
else
|
||||
AM_CONDITIONAL([USE_APPLICATIONS], false)
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
|
||||
# AC_PARADISEO()
|
||||
#
|
||||
# Compile ParadisEO if user requests it.
|
||||
AC_DEFUN([AC_PARADISEO],[dnl
|
||||
AC_ARG_ENABLE([paradiseo],[ --enable-paradiseo build ParadisEO (default=no)],
|
||||
AC_ARG_ENABLE([paradiseo],[ --enable-paradiseo build ParadisEO (default=no)],
|
||||
[ case "${enableval}" in
|
||||
yes) paradiseo=true ;;
|
||||
no) paradiseo=false ;;
|
||||
|
|
@ -10,10 +30,15 @@ AC_DEFUN([AC_PARADISEO],[dnl
|
|||
esac],
|
||||
[paradiseo=false])
|
||||
if test "$paradiseo" = "true"; then
|
||||
AC_DEFINE([PARADISEO], 1, [ParadisEO flag])
|
||||
AM_CONDITIONAL([USE_PARADISEO], true)
|
||||
AC_CHECK_PROG([MPICXX], [mpiCC], [], AC_MSG_ERROR([Need mpiCC to build PAradisEO.]))
|
||||
AC_CHECK_PROG([MPIRUN], [mpirun], [], AC_MSG_ERROR([Need mpirun to use PAradisEO.]))
|
||||
AC_CHECK_PROGS(MPICXX, [mpic++ mpiCC mpicxx], [false])
|
||||
if test $MPICXX = false; then
|
||||
AC_MSG_ERROR([mpic++ is required for ParadisEO builds.])
|
||||
fi
|
||||
AC_CHECK_PROGS(MPIRUN, [mpirun], [false])
|
||||
if test $MPIRUN = false; then
|
||||
AC_MSG_ERROR([mpirun is required for ParadisEO builds.])
|
||||
fi
|
||||
else
|
||||
AM_CONDITIONAL([USE_PARADISEO], false)
|
||||
fi
|
||||
|
|
@ -21,6 +46,26 @@ AC_DEFUN([AC_PARADISEO],[dnl
|
|||
|
||||
|
||||
|
||||
# AC_TUTORIAL()
|
||||
#
|
||||
# Compile tutorial unless user requests not to do it.
|
||||
AC_DEFUN([AC_TUTORIAL],[dnl
|
||||
AC_ARG_ENABLE([tutorial],[ --enable-tutorial build tutorial (default=yes)],
|
||||
[ case "${enableval}" in
|
||||
yes) tutorial=true ;;
|
||||
no) tutorial=false ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for tutorial option) ;;
|
||||
esac],
|
||||
[tutorial=true])
|
||||
if test "$tutorial" = "true"; then
|
||||
AM_CONDITIONAL([USE_TUTORIAL], true)
|
||||
else
|
||||
AM_CONDITIONAL([USE_TUTORIAL], false)
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
|
||||
dnl Available from the GNU Autoconf Macro Archive at:
|
||||
dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_sstream.html
|
||||
dnl
|
||||
|
|
|
|||
Reference in a new issue