Changeset 12064

Timestamp:

04/20/12 07:48:19 (13 years ago)

Author:

Eric.Larour

Message:

Added python version + better formatting of configure help

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (34 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -76 +76 @@
         dnl 1. See if matlab has been provided
         AC_ARG_WITH([matlab-dir],
-                AS_HELP_STRING([--with-matlab-dir = DIR], [matlab root directory. necessary for serial build.]),
+                AS_HELP_STRING([--with-matlab-dir=DIR], [matlab root directory. necessary for serial build.]),
                 [MATLAB_ROOT=$withval],[MATLAB_ROOT=""]) 
 
-        AC_MSG_CHECKING([wether Matlab is enabled])
+        AC_MSG_CHECKING([whether matlab is enabled])
         if test -d "$MATLAB_ROOT"; then
                 HAVE_MATLAB=yes
@@ -93 +93 @@
         dnl 2. if matlab is provided, get version number
         if test x$HAVE_MATLAB = xyes; then
-                AC_MSG_CHECKING([for Matlab version])
+                AC_MSG_CHECKING([for matlab version])
                 MATLAB_VERSION=""
 
@@ -156 +156 @@
 
                 dnl 3. Get Matlab libraries
-                AC_MSG_CHECKING(for Matlab headers and libraries in $MATLAB_ROOT)
+                AC_MSG_CHECKING(for matlab headers and libraries in $MATLAB_ROOT)
                 MATLABINCL=-I"$MATLAB_ROOT/extern/include";
                 
@@ -209 +209 @@
         dnl triangle {{{
         AC_ARG_WITH([triangle-dir],
-                          AS_HELP_STRING([--with-triangle-dir = DIR], [triangle root directory. necessary for serial build]),
+                          AS_HELP_STRING([--with-triangle-dir=DIR], [triangle root directory. necessary for serial build]),
                          [TRIANGLE_ROOT=$withval],[TRIANGLE_ROOT=""]) 
-        AC_MSG_CHECKING(for Triangle headers and libraries)
+        AC_MSG_CHECKING(for triangle headers and libraries)
 
         if test -d "$TRIANGLE_ROOT"; then
@@ -250 +250 @@
         dnl dakota{{{
         AC_ARG_WITH([dakota-dir],
-          AS_HELP_STRING([--with-dakota-dir = DIR], [dakota root directory. necessary for serial build]),
+          AS_HELP_STRING([--with-dakota-dir=DIR], [dakota root directory. necessary for serial build]),
           [DAKOTA_ROOT=$withval],[DAKOTA_ROOT=""]) 
-        AC_MSG_CHECKING(for Dakota)
+        AC_MSG_CHECKING(for dakota)
         
         if test -d "$DAKOTA_ROOT"; then
@@ -283 +283 @@
         dnl boost{{{
         AC_ARG_WITH([boost-dir],
-          AS_HELP_STRING([--with-boost-dir = DIR], [boost root directory.]),
+          AS_HELP_STRING([--with-boost-dir=DIR], [boost root directory.]),
           [BOOST_ROOT=$withval],[BOOST_ROOT=""]) 
-        AC_MSG_CHECKING(for Boost)
+        AC_MSG_CHECKING(for boost)
         
         if test -d "$BOOST_ROOT"; then
@@ -304 +304 @@
         dnl python{{{
         AC_ARG_WITH([python-dir],
-          AS_HELP_STRING([--with-python-dir = DIR], [python root directory.]),
+          AS_HELP_STRING([--with-python-dir=DIR], [python root directory.]),
           [PYTHON_ROOT=$withval],[PYTHON_ROOT=""]) 
-        AC_MSG_CHECKING(for Python)
+        AC_MSG_CHECKING(for python)
         
         if test -d "$PYTHON_ROOT"; then
@@ -328 +328 @@
         AC_MSG_RESULT($HAVE_PYTHON)
         dnl }}}
+        dnl python-version{{{
+        AC_ARG_WITH([python-version],
+          AS_HELP_STRING([--with-python-version = PYTHONVERSION],[python version.]),
+          [PYTHONVERSION=$withval],[PYTHONVERSION=""])
+        AC_MSG_CHECKING(for python version)
+
+        HAVE_PYTHON3="no"
+
+        dnl recover major: 
+        PYTHON_MAJOR=${PYTHONVERSION%.*}
+
+        if test x$PYTHON_MAJOR = x3; then
+                dnl are we running python 3?
+                HAVE_PYTHON3="yes"
+        fi
+
+        AM_CONDITIONAL([PYTHON3], [test x$HAVE_PYTHON3 = xyes])
+        AC_MSG_RESULT($PYTHON_MAJOR)
+        dnl }}}
         dnl python-numpy{{{
         AC_ARG_WITH([python-numpy-dir],
-          AS_HELP_STRING([--with-python-numpy-dir = DIR], [python-numpy root directory.]),
+          AS_HELP_STRING([--with-python-numpy-dir=DIR], [python-numpy root directory.]),
           [PYTHON_NUMPY_ROOT=$withval],[PYTHON_NUMPY_ROOT=""]) 
-        AC_MSG_CHECKING(for Python-Numpy)
+        AC_MSG_CHECKING(for python-numpy)
         
         if test -d "$PYTHON_NUMPY_ROOT"; then
@@ -348 +367 @@
         dnl chaco{{{
         AC_ARG_WITH([chaco-dir],
-          AS_HELP_STRING([--with-chaco-dir = DIR], [chaco root directory.]),
+          AS_HELP_STRING([--with-chaco-dir=DIR], [chaco root directory.]),
           [CHACO_ROOT=$withval],[CHACO_ROOT=""]) 
-        AC_MSG_CHECKING(for Chaco)
+        AC_MSG_CHECKING(for chaco)
         
         if test -d "$CHACO_ROOT"; then
@@ -370 +389 @@
         dnl scotch{{{
         AC_ARG_WITH([scotch-dir],
-          AS_HELP_STRING([--with-scotch-dir = DIR], [scotch root directory.]),
+          AS_HELP_STRING([--with-scotch-dir=DIR], [scotch root directory.]),
           [SCOTCH_ROOT=$withval],[SCOTCH_ROOT=""]) 
-        AC_MSG_CHECKING(for Scotch)
+        AC_MSG_CHECKING(for scotch)
         
         if test -d "$SCOTCH_ROOT"; then
@@ -392 +411 @@
         dnl adolc{{{
         AC_ARG_WITH([adolc-dir],
-                AS_HELP_STRING([--with-adolc-dir = DIR], [adolc root directory.]),
+                AS_HELP_STRING([--with-adolc-dir=DIR], [adolc root directory.]),
                 [ADOLC_ROOT=$withval],[ADOLC_ROOT="no"]) 
-        AC_MSG_CHECKING(for ADOLC)
+        AC_MSG_CHECKING(for adolc)
 
         if test "x$ADOLC_ROOT" = "xno"; then
@@ -420 +439 @@
         dnl adic2{{{
         AC_ARG_WITH([adic2-dir],
-          AS_HELP_STRING([--with-adic2-dir = DIR], [adic2 root directory.]),
+          AS_HELP_STRING([--with-adic2-dir=DIR], [adic2 root directory.]),
           [ADIC2_ROOT=$withval],[ADIC2_ROOT="no"]) 
-        AC_MSG_CHECKING(for ADIC2)
+        AC_MSG_CHECKING(for adic2)
 
         if test "x$ADIC2_ROOT" = "xno"; then
@@ -448 +467 @@
         dnl gsl{{{
         AC_ARG_WITH([gsl-dir],
-          AS_HELP_STRING([--with-gsl-dir = DIR], [gsl root directory.]),
+          AS_HELP_STRING([--with-gsl-dir=DIR], [gsl root directory.]),
           [GSL_ROOT=$withval],[GSL_ROOT=""]) 
-        AC_MSG_CHECKING(for Gsl)
+        AC_MSG_CHECKING(for gsl)
         
         if test -d "$GSL_ROOT"; then
@@ -471 +490 @@
         dnl rose{{{
         AC_ARG_WITH([rose-dir],
-          AS_HELP_STRING([--with-rose-dir = DIR], [rose root directory.]),
+          AS_HELP_STRING([--with-rose-dir=DIR], [rose root directory.]),
           [ROSE_ROOT=$withval],[ROSE_ROOT=""]) 
-        AC_MSG_CHECKING(for Rose)
+        AC_MSG_CHECKING(for rose)
         
         if test -d "$ROSE_ROOT"; then
@@ -494 +513 @@
         dnl metis{{{
         AC_ARG_WITH([metis-dir],
-          AS_HELP_STRING([--with-metis-dir = DIR],[metis root directory. necessary for serial build]),
+          AS_HELP_STRING([--with-metis-dir=DIR],[metis root directory. necessary for serial build]),
           [METIS_ROOT=$withval],[METIS_ROOT=""])
 
         if test -d "$METIS_ROOT"; then
 
-                AC_MSG_CHECKING(for Metis headers and libraries in $METIS_ROOT)
+                AC_MSG_CHECKING(for metis headers and libraries in $METIS_ROOT)
 
                 dnl first figure out version of metis: does the VERSION file exist?
@@ -566 +585 @@
         
         AC_ARG_WITH([mpi-include],
-          AS_HELP_STRING([--with-mpi-include = DIR],[mpi include directory, necessary for parallel build]),
+          AS_HELP_STRING([--with-mpi-include=DIR],[mpi include directory, necessary for parallel build]),
           [MPI_INCLUDE=$withval],[MPI_INCLUDE=""])
         
@@ -575 +594 @@
                         HAVE_MPI=no
                 else
+                        HAVE_MPI=yes
                         MPIINCL=-I"$MPI_INCLUDE/"
                         AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src])
@@ -582 +602 @@
                 fi
         fi
-        AC_MSG_RESULT(done)
+        AC_MSG_RESULT($HAVE_MPI)
         dnl }}}
         dnl petsc{{{
         AC_ARG_WITH([petsc-dir],
-          AS_HELP_STRING([--with-petsc-dir = DIR],[PETSc root directory, necessary for parallel build]),
+          AS_HELP_STRING([--with-petsc-dir=DIR],[PETSc root directory, necessary for parallel build]),
           [PETSC_ROOT=$withval],[PETSC_ROOT=""])
                 
         if test -d "$PETSC_ROOT"; then
-                AC_MSG_CHECKING(for PETSc version)
+                AC_MSG_CHECKING(for petsc version)
                 PETSC_MAJOR=`cat $PETSC_ROOT/include/petscversion.h | grep "#define PETSC_VERSION_MAJOR" | sed 's/#define PETSC_VERSION_MAJOR//' | sed 's/ //g'`
                 PETSC_MINOR=`cat $PETSC_ROOT/include/petscversion.h | grep "#define PETSC_VERSION_MINOR" | sed 's/#define PETSC_VERSION_MINOR//' | sed 's/ //g'`
@@ -598 +618 @@
 
                 PETSC_VERSION_DATE_HG=`cat $PETSC_ROOT/include/petscversion.h | grep "#define PETSC_VERSION_DATE_HG" | sed 's/#define PETSC_VERSION_DATE_HG//' | sed 's/ //g' | sed -e 's/\"//g' `
-                AC_MSG_CHECKING(wether PETSc is the development version)
+                AC_MSG_CHECKING(whether petsc is the development version)
                 if test x$PETSC_VERSION_DATE_HG = xunknown; then
                         AC_DEFINE([_HAVE_PETSCDEV_],[1],[with PETSc-dev])
@@ -608 +628 @@
         
         AC_ARG_WITH([petsc-arch],
-          AS_HELP_STRING([--with-petsc-arch = DIR],[PETSc arch , necessary for parallel build]),
+          AS_HELP_STRING([--with-petsc-arch=DIR],[PETSc arch , necessary for parallel build]),
           [PETSC_ARCH=$withval],[PETSC_ARCH=""])
 
-        AC_MSG_CHECKING(for PETSc headers and libraries in $PETSC_ROOT for architecture $PETSC_ARCH)
+        AC_MSG_CHECKING(for petsc headers and libraries in $PETSC_ROOT for architecture $PETSC_ARCH)
         
         if test -d "$PETSC_ROOT"; then
@@ -655 +675 @@
         dnl tao{{{
         AC_ARG_WITH([tao-dir],
-                AS_HELP_STRING([--with-tao-dir = DIR], [tao root directory.]),
+                AS_HELP_STRING([--with-tao-dir=DIR], [tao root directory.]),
                 [TAO_ROOT=$withval],[TAO_ROOT=""]) 
-        AC_MSG_CHECKING(for Tao)
+        AC_MSG_CHECKING(for tao)
 
         if test -d "$TAO_ROOT"; then
@@ -675 +695 @@
         dnl slepc{{{
         AC_ARG_WITH([slepc-dir],
-          AS_HELP_STRING([--with-slepc-dir = DIR],[slepc root directory]),
+          AS_HELP_STRING([--with-slepc-dir=DIR],[slepc root directory]),
           [SLEPC_ROOT=$withval],[SLEPC_ROOT=""])
                           
-        AC_MSG_CHECKING(for Slepc headers and libraries in $SLEPC_ROOT)
+        AC_MSG_CHECKING(for slepc headers and libraries in $SLEPC_ROOT)
         if test -d "$SLEPC_ROOT"; then
                 HAVE_SLEPC=yes
@@ -694 +714 @@
         dnl shapelib{{{
         AC_ARG_WITH([shapelib-dir],
-          AS_HELP_STRING([--with-shapelib-dir = DIR], [shapelib root directory]),
+          AS_HELP_STRING([--with-shapelib-dir=DIR], [shapelib root directory]),
           [SHAPELIB_ROOT=$withval],[SHAPELIB_ROOT=""])
                           
-        AC_MSG_CHECKING(for Shapelib headers and libraries in $SHAPELIB_ROOT)
+        AC_MSG_CHECKING(for shapelib headers and libraries in $SHAPELIB_ROOT)
         if test -d "$SHAPELIB_ROOT"; then
 
@@ -715 +735 @@
         dnl scalapack{{{
         AC_ARG_WITH([scalapack-dir],
-          AS_HELP_STRING([--with-scalapack-dir = DIR],[scalapack root directory]),
+          AS_HELP_STRING([--with-scalapack-dir=DIR],[scalapack root directory]),
           [SCALAPACK_ROOT=$withval],[SCALAPACK_ROOT=""])
                           
-        AC_MSG_CHECKING(for Scalapack headers and libraries in $SCALAPACK_ROOT)
+        AC_MSG_CHECKING(for scalapack headers and libraries in $SCALAPACK_ROOT)
         if test -d "$SCALAPACK_ROOT"; then
 
@@ -734 +754 @@
         dnl blas{{{
         AC_ARG_WITH([blas-lapack-dir],
-          AS_HELP_STRING([--with-blas-lapack-dir = DIR],[blas-lapack root directory]),
+          AS_HELP_STRING([--with-blas-lapack-dir=DIR],[blas-lapack root directory]),
           [BLASLAPACK_ROOT=$withval],[BLASLAPACK_ROOT=""])
                           
-        AC_MSG_CHECKING(for Blas and Lapack headers and libraries in $BLASLAPACK_ROOT)
+        AC_MSG_CHECKING(for blas and lapack headers and libraries in $BLASLAPACK_ROOT)
         if test -d "$BLASLAPACK_ROOT"; then
 
@@ -767 +787 @@
         dnl mkl{{{
         AC_ARG_WITH([mkl-dir],
-          AS_HELP_STRING([--with-mkl-dir = DIR],[mkl root directory]),
+          AS_HELP_STRING([--with-mkl-dir=DIR],[mkl root directory]),
           [MKL_ROOT=$withval],[MKL_ROOT=""])
                           
@@ -786 +806 @@
         dnl }}}
         dnl plapack{{{
+        AC_MSG_CHECKING(for plapack)
+        
         AC_ARG_WITH([plapack-lib],
           AS_HELP_STRING([--with-plapack-lib = lib],[plapack library]),
           [PLAPACK_LIB=$withval],[PLAPACK_LIB=""])
-        AC_MSG_CHECKING(for Plapack libraries)
         
         AC_ARG_WITH([plapack-include],
@@ -795 +816 @@
                                                          [plapack include ]),
                           [PLAPACK_INCLUDE=$withval],[PLAPACK_INCLUDE=""])
-        AC_MSG_CHECKING(for Plapack headers)
           
         if test -n "$PLAPACK_LIB"; then
@@ -818 +838 @@
         dnl mumps{{{
         AC_ARG_WITH([mumps-dir],
-          AS_HELP_STRING([--with-mumps-dir = DIR],[mumps root directory]),
+          AS_HELP_STRING([--with-mumps-dir=DIR],[mumps root directory]),
           [MUMPS_ROOT=$withval],[MUMPS_ROOT=""])
                           
-        AC_MSG_CHECKING(for Mumps headers and libraries in $MUMPS_ROOT)
+        AC_MSG_CHECKING(for mumps headers and libraries in $MUMPS_ROOT)
         if test -d "$MUMPS_ROOT"; then
 
@@ -843 +863 @@
         dnl blacs{{{
         AC_ARG_WITH([blacs-dir],
-                AS_HELP_STRING([--with-blacs-dir = DIR],[blacs root directory]),
+                AS_HELP_STRING([--with-blacs-dir=DIR],[blacs root directory]),
                           [BLACS_ROOT=$withval],[BLACS_ROOT=""])
                           
-        AC_MSG_CHECKING(for Blacs headers and libraries in $BLACS_ROOT)
+        AC_MSG_CHECKING(for blacs headers and libraries in $BLACS_ROOT)
         if test -d "$BLACS_ROOT"; then
 
@@ -864 +884 @@
         dnl hypre{{{
         AC_ARG_WITH([hypre-dir],
-          AS_HELP_STRING([--with-hypre-dir = DIR],[hypre root directory]),
+          AS_HELP_STRING([--with-hypre-dir=DIR],[hypre root directory]),
                           [HYPRE_ROOT=$withval],[HYPRE_ROOT=""])
                           
-        AC_MSG_CHECKING(for Hypre headers and libraries in $HYPRE_ROOT)
+        AC_MSG_CHECKING(for hypre headers and libraries in $HYPRE_ROOT)
         if test -d "$HYPRE_ROOT"; then
 
@@ -885 +905 @@
         dnl ml{{{
         AC_ARG_WITH([ml-dir],
-          AS_HELP_STRING([--with-ml-dir = DIR],[ml root directory]),
+          AS_HELP_STRING([--with-ml-dir=DIR],[ml root directory]),
                           [ML_ROOT=$withval],[ML_ROOT=""])
                           
-        AC_MSG_CHECKING(for Ml headers and libraries in $ML_ROOT)
+        AC_MSG_CHECKING(for ml headers and libraries in $ML_ROOT)
         if test -d "$ML_ROOT"; then
 
@@ -1202 +1222 @@
         fi
 
+        dnl check that we python version if python compile is specified
+        dnl if test "$HAVE_PYTHON" = "yes"  && test "$HAVE_PYTHONVERSION" = "no" ; then
+        dnl     AC_MSG_ERROR([need python-version if python compile is required!]);
+        dnl fi
+
+
         AC_MSG_RESULT(done)
         dnl }}}
@@ -1211 +1237 @@
           AS_HELP_STRING([--with-cxxoptflags = CXXOPTFLAGS], [optimization using CXX flags, ex: --with-cxxoptflags=-march=opteron -O3]),
           [CXXOPTFLAGS=$withval],[CXXOPTFLAGS="-g -O2"]) 
-        AC_MSG_CHECKING(for C++ optimization flags)
+        AC_MSG_CHECKING(for c++ optimization flags)
         AC_SUBST([CXXOPTFLAGS])
         AC_MSG_RESULT(done)