Index: /issm/trunk/m4/issm_options.m4 =================================================================== --- /issm/trunk/m4/issm_options.m4 (revision 4664) +++ /issm/trunk/m4/issm_options.m4 (revision 4665) @@ -3,8 +3,6 @@ AC_DEFUN([ISSM_OPTIONS],[ - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%debugging-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl ISSM's internal options + dnl Debugging {{{1 AC_ARG_ENABLE([debugging],AS_HELP_STRING([--enable-debugging], [turn debug support on]), @@ -13,10 +11,6 @@ AC_DEFINE([_ISSM_DEBUG_],[1],[Macro to enable debugging in ISSM.]) fi - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%Debuggin-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%serial build-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl Serial build {{{1 AC_ARG_WITH([serial], AS_HELP_STRING([--with-serial = value], @@ -26,8 +20,6 @@ AM_CONDITIONAL([NOSERIAL], [test $SERIAL_VALUE = no]) AC_MSG_RESULT($SERIAL_VALUE) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%serial build-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%parallel build-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl Parallel build {{{1 AC_ARG_WITH([parallel], AS_HELP_STRING([--with-parallel = value], @@ -37,9 +29,7 @@ AM_CONDITIONAL([NOPARALLEL], [test $PARALLEL_VALUE = no]) AC_MSG_RESULT($PARALLEL_VALUE) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%parallel build-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - dnl: check that at least serial or parallel builds have been requested! + dnl }}} + dnl Serial or Parallel check {{{1 + dnl Check that at least serial or parallel builds have been requested! if test "$SERIAL_VALUE" != "yes" ; then if test "$PARALLEL_VALUE" != "yes"; then @@ -47,7 +37,8 @@ fi fi - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%matlab-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + + dnl ISSM's externalpackages + dnl Matlab {{{1 AC_ARG_WITH([matlab-dir], AS_HELP_STRING([--with-matlab-dir = DIR], @@ -131,9 +122,6 @@ AM_CONDITIONAL(LARGEARRAYS, test x$largearrays = xyes) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%matlab-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%triangle-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl triangle {{{1 AC_ARG_WITH([triangle-dir], AS_HELP_STRING([--with-triangle-dir = DIR], [triangle root directory. necessary for serial build]), @@ -164,9 +152,6 @@ fi AC_MSG_RESULT(ok) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%triangle-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%dakota-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl dakota{{{1 AC_ARG_WITH([dakota-dir], AS_HELP_STRING([--with-dakota-dir = DIR], [dakota root directory. necessary for serial build]), @@ -189,7 +174,6 @@ fi AC_MSG_RESULT($HAVE_DAKOTA) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%dakota-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%chaco-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl chaco{{{1 AC_ARG_WITH([chaco-dir], AS_HELP_STRING([--with-chaco-dir = DIR], [chaco root directory.]), @@ -212,10 +196,6 @@ fi AC_MSG_RESULT($HAVE_CHACO) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%chaco-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%scotch-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl scotch{{{1 AC_ARG_WITH([scotch-dir], AS_HELP_STRING([--with-scotch-dir = DIR], [scotch root directory.]), @@ -239,9 +219,6 @@ fi AC_MSG_RESULT($HAVE_SCOTCH) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%scotch-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%metis-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl metis{{{1 AC_ARG_WITH([metis-dir], AS_HELP_STRING([--with-metis-dir = DIR], @@ -282,10 +259,6 @@ AC_MSG_RESULT($HAVE_METIS) fi - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%metis-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%mpi-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl mpi{{{1 AC_MSG_CHECKING(for mpi...) AC_ARG_WITH([mpi-lib], @@ -320,9 +293,6 @@ fi AC_MSG_RESULT(done) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%mpi-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%petsc-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl petsc{{{1 AC_ARG_WITH([petsc-dir], AS_HELP_STRING([--with-petsc-dir = DIR], @@ -400,11 +370,6 @@ AC_MSG_RESULT($HAVE_PETSC) fi - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%petsc-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%mpiuni-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl mpiuni{{{1 dnl when running in serial mode, MPI must be ignored, and set to internal petsc mpiuni: if test "$PARALLEL_VALUE" = "no" ; then @@ -429,8 +394,6 @@ AC_SUBST([MPILIB]) fi - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%mpiuni-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%slepc-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl slepc{{{1 AC_ARG_WITH([slepc-dir], AS_HELP_STRING([--with-slepc-dir = DIR], @@ -454,9 +417,6 @@ fi AC_MSG_RESULT($HAVE_SLEPC) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%slepc-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%scalapack-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl scalapack{{{1 AC_ARG_WITH([scalapack-dir], AS_HELP_STRING([--with-scalapack-dir = DIR], @@ -478,10 +438,6 @@ fi AC_MSG_RESULT($HAVE_SCALAPACK) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%scalapack-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%blas-lapack-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl blas{{{1 AC_ARG_WITH([blas-lapack-dir], AS_HELP_STRING([--with-blas-lapack-dir = DIR], @@ -519,9 +475,6 @@ fi AC_MSG_RESULT($HAVE_BLASLAPACK) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%blas-lapack-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%mkl-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl mkl{{{1 AC_ARG_WITH([mkl-dir], AS_HELP_STRING([--with-mkl-dir = DIR], @@ -544,9 +497,6 @@ fi AC_MSG_RESULT($HAVE_MKL) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%mkl-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%plapack-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl plapack{{{1 AC_ARG_WITH([plapack-lib], AS_HELP_STRING([--with-plapack-lib = lib], @@ -579,11 +529,6 @@ fi AC_MSG_RESULT($HAVE_PLAPACK) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%plapack-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%mumps-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl mumps{{{1 dnl Mumps directory @@ -612,9 +557,6 @@ fi AC_MSG_RESULT($HAVE_MUMPS) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%mumps-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%blacs-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl blacs{{{1 AC_ARG_WITH([blacs-dir], AS_HELP_STRING([--with-blacs-dir = DIR], @@ -637,10 +579,6 @@ fi AC_MSG_RESULT($HAVE_BLACS) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%blacs-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%math-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl math{{{1 AC_MSG_CHECKING(for math library...) AC_ARG_WITH([math-lib], @@ -658,9 +596,6 @@ fi AC_MSG_RESULT(done) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%math-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%fortran-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl fortran{{{1 dnl fortran library option AC_MSG_CHECKING(for fortran library...) @@ -679,10 +614,6 @@ fi AC_MSG_RESULT(done) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%fortran-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%graphics-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl graphics{{{1 AC_MSG_CHECKING(for graphics library...) AC_ARG_WITH([graphics-lib], @@ -700,9 +631,6 @@ fi AC_MSG_RESULT(done) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%graphics-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%vendor-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl vendor{{{1 AC_ARG_WITH([vendor], AS_HELP_STRING([--with-vendor = VENDOR], [vendor name, ex: intel]), @@ -728,9 +656,8 @@ fi AC_MSG_RESULT(done) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%vendor-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%optimization-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + + dnl other options + dnl optimization{{{1 dnl bypass standard optimization -g -O2 ? AC_ARG_WITH([cxxoptflags], @@ -741,7 +668,6 @@ AC_MSG_RESULT(done) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%optimization-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%multithreading-beginning%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl multithreading{{{1 AC_ARG_WITH([numthreads], AS_HELP_STRING([--with-numthreads = NUMTHREADS_VALUE], @@ -772,7 +698,6 @@ AC_SUBST([MULTITHREADINGLIB]) AC_MSG_RESULT($NUMTHREADS_VALUE) - dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%numthreads build-end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - dnl dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%64 bit indices%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + dnl }}} + dnl 64bit {{{1 AC_ARG_WITH([64bit-indices], AS_HELP_STRING([--with-64bit-indices = bool], [use 64 bit integers, default 0, ex: --with-64bit-indices=1]), @@ -787,6 +712,5 @@ fi AC_MSG_RESULT($USE_64BIT_INDICES) - dnl dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%64 bit indices end%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - + dnl }}} ])