Commit 7fbd5c5d authored by gsell's avatar gsell

configure.ac: set version to 2.0.0rc1; correct indentation

parent 18611991
# #
# Copyright (c) 2006-2015, The Regents of the University of California, # Copyright (c) 2006-2016, The Regents of the University of California,
# through Lawrence Berkeley National Laboratory (subject to receipt of any # through Lawrence Berkeley National Laboratory (subject to receipt of any
# required approvals from the U.S. Dept. of Energy) and the Paul Scherrer # required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
# Institut (Switzerland). All rights reserved. # Institut (Switzerland). All rights reserved.
# #
# License: see file COPYING in top level of source distribution. # License: see file COPYING in top level of source distribution.
# #
AC_INIT([H5hut], [1.99.15rc1], [h5part@lists.psi.ch], H5hut) AC_INIT([H5hut], [2.0.0rc1], [h5part@lists.psi.ch], H5hut)
AC_PREREQ(2.60) AC_PREREQ(2.60)
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
...@@ -41,10 +41,10 @@ AC_ARG_ENABLE( ...@@ -41,10 +41,10 @@ AC_ARG_ENABLE(
AM_CONDITIONAL([ENABLE_FORTRAN], [test "$ENABLE_FORTRAN" = "yes"]) AM_CONDITIONAL([ENABLE_FORTRAN], [test "$ENABLE_FORTRAN" = "yes"])
AC_ARG_ENABLE( AC_ARG_ENABLE(
[python], [python],
[AS_HELP_STRING([--enable-python], [AS_HELP_STRING([--enable-python],
[Compile the Python interface [default=no]])], [Compile the Python interface [default=no]])],
[ENABLE_PYTHON=$enableval]) [ENABLE_PYTHON=$enableval])
AM_CONDITIONAL([ENABLE_PYTHON], [test "$ENABLE_PYTHON" = "yes"]) AM_CONDITIONAL([ENABLE_PYTHON], [test "$ENABLE_PYTHON" = "yes"])
AC_ARG_ENABLE( AC_ARG_ENABLE(
...@@ -291,45 +291,45 @@ fi ...@@ -291,45 +291,45 @@ fi
# python enabled? # python enabled?
if test "X$ENABLE_PYTHON" = "Xyes"; then if test "X$ENABLE_PYTHON" = "Xyes"; then
AM_PATH_PYTHON([2.5]) AM_PATH_PYTHON([2.5])
AX_PKG_SWIG([1.3], [], [ AC_MSG_ERROR([SWIG is required to build..]) ]) AX_PKG_SWIG([1.3], [], [ AC_MSG_ERROR([SWIG is required to build..]) ])
#SWIG_ENABLE_CXX #SWIG_ENABLE_CXX
#SWIG_PYTHON #SWIG_PYTHON
PYTHON_PREFIX=`python-config --prefix` PYTHON_PREFIX=`python-config --prefix`
PYTHON_EXEC_PREFIX=`python-config --exec-prefix` PYTHON_EXEC_PREFIX=`python-config --exec-prefix`
# make sure numpy is available.. # make sure numpy is available..
AC_MSG_CHECKING([for numpy support]) AC_MSG_CHECKING([for numpy support])
NUMPY_INCLUDE=`${PYTHON} -c 'import numpy; print numpy.get_include()'` NUMPY_INCLUDE=`${PYTHON} -c 'import numpy; print numpy.get_include()'`
if test "X$?" = "X0" ; then if test "X$?" = "X0" ; then
AC_MSG_RESULT([$NUMPY_INCLUDE]) AC_MSG_RESULT([$NUMPY_INCLUDE])
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
exit 1 exit 1
fi fi
AC_SUBST([NUMPY_INCLUDE]) AC_SUBST([NUMPY_INCLUDE])
#check for parallel support #check for parallel support
if test "X$ENABLE_PARALLEL" = "Xyes"; then if test "X$ENABLE_PARALLEL" = "Xyes"; then
AC_MSG_CHECKING([for mpi4py support]) AC_MSG_CHECKING([for mpi4py support])
MPI4PY_INCLUDE=`${PYTHON} -c 'import mpi4py; print mpi4py.get_include()'` MPI4PY_INCLUDE=`${PYTHON} -c 'import mpi4py; print mpi4py.get_include()'`
if test "X$?" = "X0" ; then if test "X$?" = "X0" ; then
AC_MSG_RESULT([$MPI4PY_INCLUDE]) AC_MSG_RESULT([$MPI4PY_INCLUDE])
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
exit 1 exit 1
fi fi
AC_SUBST([MPI4PY_INCLUDE]) AC_SUBST([MPI4PY_INCLUDE])
fi fi
AC_MSG_RESULT([ok]) AC_MSG_RESULT([ok])
else else
AC_MSG_CHECKING([if python interface is enabled]) AC_MSG_CHECKING([if python interface is enabled])
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
######################## large indices enabled ########################### ######################## large indices enabled ###########################
...@@ -489,11 +489,11 @@ AC_MSG_RESULT([HDF5_PREFIX = $HDF5_PREFIX]) ...@@ -489,11 +489,11 @@ AC_MSG_RESULT([HDF5_PREFIX = $HDF5_PREFIX])
AC_MSG_RESULT([LUSTREROOT = $LUSTREROOT]) AC_MSG_RESULT([LUSTREROOT = $LUSTREROOT])
if test "x$ENABLE_PYTHON" = "xyes"; then if test "x$ENABLE_PYTHON" = "xyes"; then
AC_MSG_RESULT([PYTHON = $PYTHON]) AC_MSG_RESULT([PYTHON = $PYTHON])
AC_MSG_RESULT([SWIG = $SWIG]) AC_MSG_RESULT([SWIG = $SWIG])
AC_MSG_RESULT([NUMPY_INCLUDE = $NUMPY_INCLUDE]) AC_MSG_RESULT([NUMPY_INCLUDE = $NUMPY_INCLUDE])
if test "x$ENABLE_PARALLEL" = "xyes"; then if test "x$ENABLE_PARALLEL" = "xyes"; then
AC_MSG_RESULT([MPI4PY_INCLUDE = $MPI4PY_INCLUDE]) AC_MSG_RESULT([MPI4PY_INCLUDE = $MPI4PY_INCLUDE])
fi fi
fi fi
AC_MSG_RESULT([ ]) AC_MSG_RESULT([ ])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment