Commit 474b9d32 authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Merge branch 'autotools-update' into 'master'

Parallel HDF5 autoconf test

Add a HDF5 autoconf check

See merge request !16


Former-commit-id: 2a5e8f452c4bcc9a24535901a64a16999b466e56
parents c05bbb67 8993d1fc
......@@ -212,9 +212,23 @@ AC_CHECK_LIB([z],[gzopen],[
],[])
# Check for HDF5.
# Check for HDF5. Need to differentiate between parallel and serial.
AX_LIB_HDF5
# Need to ask the HDF5 compiler about its configuration, -showconfig should
# have yes/no
have_parallel_hdf5="no"
if test "$with_hdf5" = "yes"; then
AC_MSG_CHECKING([for HDF5 parallel support])
parallel=`$H5CC -showconfig | grep "Parallel HDF5:" | awk '{print $3}'`
if test "$parallel" = "yes"; then
have_parallel_hdf5="yes"
AC_DEFINE([HAVE_PARALLEL_HDF5],1,[HDF5 library supports parallel access])
fi
AC_MSG_RESULT($parallel)
fi
AM_CONDITIONAL([HAVEPARALLELHDF5],[test "$have_parallel_hdf5" = "yes"])
# Check for setaffinity.
AC_CHECK_FUNC( pthread_setaffinity_np , AC_DEFINE([HAVE_SETAFFINITY],[true],
[Defined if pthread_setaffinity_np exists.]) )
......@@ -256,6 +270,7 @@ AC_MSG_RESULT([
flags: $CFLAGS
MPI enabled: $enable_mpi
HDF5 enabled: $with_hdf5
parallel: $have_parallel_hdf5
OpenMP enabled: $enable_openmp
Metis enabled: $with_metis
])
......
......@@ -238,7 +238,7 @@ HDF5 support is being disabled (equivalent to --with-hdf5=no).
CPPFLAGS=$HDF5_CPPFLAGS
LIBS=$HDF5_LIBS
LDFLAGS=$HDF5_LDFLAGS
AC_CHECK_HEADER([hdf5.h], [ac_cv_hadf5_h=yes], [ac_cv_hadf5_h=no])
AC_CHECK_HEADER([hdf5.h], [ac_cv_hadf5_h=yes], [ac_cv_hadf5_h=no], [AC_INCLUDES_DEFAULT])
AC_CHECK_LIB([hdf5], [H5Fcreate], [ac_cv_libhdf5=yes],
[ac_cv_libhdf5=no])
if test "$ac_cv_hadf5_h" = "no" && test "$ac_cv_libhdf5" = "no" ; then
......
Supports Markdown
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