Commit 17fcede0 authored by Leo Pound Singer's avatar Leo Pound Singer

Revert "Try checking for LAL HDF5 support later in lalinference/configure.ac"

This reverts commit 3f304eb1907aa935f33141e35de91ae8c006e50a.
This did not fix the top-level build issue.
Original: 3e34929fd2d3682b88123b9413c89412d0c6d058
parent 296d645d
......@@ -171,6 +171,20 @@ AC_CHECK_LIB([metaio],[MetaioOpen],,[AC_MSG_ERROR([could not find the metaio lib
# check for libmetaio headers
AC_CHECK_HEADERS([metaio.h],,[AC_MSG_ERROR([could not find the metaio.h header])])
# check for hdf5 support
HDF5_ENABLE_VAL="DISABLED"
# Note that AX_LIB_HDF5 uses h5cc to determine compiler for configure tests.
# Make sure that it uses the same compiler as we are using.
# Otherwise the configure tests may fail if we are using icc.
HDF5_CC="${CC}"; export HDF5_CC
HDF5_CLINKER="${CC}"; export HDF5_CLINKER
AX_LIB_HDF5()
unset HDF5_CC
unset HDF5_CLINKER
if test "${with_hdf5}" != "yes"; then
AC_MSG_ERROR([could not find the HDF5 library])
fi
if test "$lalxml" = "true"; then
# check for libxml2
PKG_CHECK_MODULES([LIBXML2],[libxml-2.0 >= 2.6],[true],[false])
......@@ -237,20 +251,6 @@ AS_IF(
]
)
# check for hdf5 support
HDF5_ENABLE_VAL="DISABLED"
# Note that AX_LIB_HDF5 uses h5cc to determine compiler for configure tests.
# Make sure that it uses the same compiler as we are using.
# Otherwise the configure tests may fail if we are using icc.
HDF5_CC="${CC}"; export HDF5_CC
HDF5_CLINKER="${CC}"; export HDF5_CLINKER
AX_LIB_HDF5()
unset HDF5_CC
unset HDF5_CLINKER
if test "${with_hdf5}" != "yes"; then
AC_MSG_ERROR([could not find the HDF5 library])
fi
# add gcc specific flags
LALSUITE_ADD_GCC_FLAGS
......
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