From d128ce74da9b19f22eb739df89eb7695b15928da Mon Sep 17 00:00:00 2001 From: Lourens Veen Date: Thu, 12 Mar 2026 21:37:51 +0100 Subject: [PATCH 1/2] Add libz as an explicit dependency for SimpleX and MESA r15140 --- .../packages/amuse-mesa-r15140.amuse_deps | 2 +- src/amuse_mesa_r15140/support/aclocal.m4 | 1 + src/amuse_mesa_r15140/support/configure | 68 ++++++++++++++ src/amuse_mesa_r15140/support/configure.ac | 1 + .../packages/amuse-simplex.amuse_deps | 2 +- src/amuse_simplex/support/aclocal.m4 | 1 + src/amuse_simplex/support/configure | 61 ++++++++++++ src/amuse_simplex/support/configure.ac | 1 + support/aclocal.m4 | 1 + support/configure | 94 +++++++++++++++++++ support/configure.ac | 3 + support/setup/dependencies.sh | 11 ++- support/shared/m4/amuse_libz.m4 | 41 ++++++++ 13 files changed, 282 insertions(+), 5 deletions(-) create mode 100644 support/shared/m4/amuse_libz.m4 diff --git a/src/amuse_mesa_r15140/packages/amuse-mesa-r15140.amuse_deps b/src/amuse_mesa_r15140/packages/amuse-mesa-r15140.amuse_deps index ad14dc143f..85d4dbf017 100644 --- a/src/amuse_mesa_r15140/packages/amuse-mesa-r15140.amuse_deps +++ b/src/amuse_mesa_r15140/packages/amuse-mesa-r15140.amuse_deps @@ -1 +1 @@ -c c++ fortran python bison cmake install download patch mpi openmp hdf5 lapack blas perl tar gunzip unzip unxz +c c++ fortran python bison cmake install download patch mpi openmp hdf5 libz lapack blas perl tar gunzip unzip unxz diff --git a/src/amuse_mesa_r15140/support/aclocal.m4 b/src/amuse_mesa_r15140/support/aclocal.m4 index d04ff68451..8642cf4e42 100644 --- a/src/amuse_mesa_r15140/support/aclocal.m4 +++ b/src/amuse_mesa_r15140/support/aclocal.m4 @@ -14,6 +14,7 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([shared/m4/amuse_download.m4]) m4_include([shared/m4/amuse_lib.m4]) +m4_include([shared/m4/amuse_libz.m4]) m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_blas.m4]) diff --git a/src/amuse_mesa_r15140/support/configure b/src/amuse_mesa_r15140/support/configure index 2fad7dc4f8..0126bcaff0 100755 --- a/src/amuse_mesa_r15140/support/configure +++ b/src/amuse_mesa_r15140/support/configure @@ -647,6 +647,8 @@ ac_includes_default="\ ac_header_c_list= ac_subst_vars='LTLIBOBJS LIBOBJS +LIBZ_LIBS +LIBZ_CFLAGS HDF5_TYPE HDF5_FLIBS HDF5_FFLAGS @@ -9991,6 +9993,72 @@ printf "%s\n" "#define HAVE_HDF5 1" >>confdefs.h fi + amuse_libz_save_libs="$LIBS" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libz" >&5 +printf %s "checking for libz... " >&6; } + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + LIBS="-lz" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + +#ifdef F77_DUMMY_MAIN + +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } + +#endif +int +main (void) +{ + + z_stream strm; + deflateInit(&strm, 0); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + FOUND_LIBZ="yes" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + + ac_ext=${ac_fc_srcext-f} +ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' +ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_fc_compiler_gnu + + + + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/src/amuse_mesa_r15140/support/configure.ac b/src/amuse_mesa_r15140/support/configure.ac index 593b4e00c4..2e2a2d18c5 100644 --- a/src/amuse_mesa_r15140/support/configure.ac +++ b/src/amuse_mesa_r15140/support/configure.ac @@ -70,6 +70,7 @@ AC_SUBST(OPENMP_FCFLAGS) AX_LAPACK() AX_LIB_HDF5() +AMUSE_LIBZ() AC_LANG_POP([Fortran]) diff --git a/src/amuse_simplex/packages/amuse-simplex.amuse_deps b/src/amuse_simplex/packages/amuse-simplex.amuse_deps index 537c9b810f..728a9cc05b 100644 --- a/src/amuse_simplex/packages/amuse-simplex.amuse_deps +++ b/src/amuse_simplex/packages/amuse-simplex.amuse_deps @@ -1 +1 @@ -c++ mpi gsl hdf5 qhull healpix-cxx +c++ mpi gsl hdf5 qhull healpix-cxx libz diff --git a/src/amuse_simplex/support/aclocal.m4 b/src/amuse_simplex/support/aclocal.m4 index cc85f80f84..d89d208f92 100644 --- a/src/amuse_simplex/support/aclocal.m4 +++ b/src/amuse_simplex/support/aclocal.m4 @@ -14,6 +14,7 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_include([shared/m4/amuse_lib_healpix.m4]) m4_include([shared/m4/amuse_lib_qhull.m4]) +m4_include([shared/m4/amuse_libz.m4]) m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) diff --git a/src/amuse_simplex/support/configure b/src/amuse_simplex/support/configure index b11cb128bf..83484cb8de 100755 --- a/src/amuse_simplex/support/configure +++ b/src/amuse_simplex/support/configure @@ -711,6 +711,8 @@ HEALPIX_CXX_LIBS HEALPIX_CXX_CFLAGS QHULL_FLAGS QHULL_LIBS +LIBZ_LIBS +LIBZ_CFLAGS HDF5_TYPE HDF5_FLIBS HDF5_FFLAGS @@ -5983,6 +5985,65 @@ printf "%s\n" "#define HAVE_HDF5 1" >>confdefs.h fi + amuse_libz_save_libs="$LIBS" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libz" >&5 +printf %s "checking for libz... " >&6; } + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + LIBS="-lz" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + +int +main (void) +{ + + z_stream strm; + deflateInit(&strm, 0); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + FOUND_LIBZ="yes" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + + + + amuse_lib_qhull_save_libs="$LIBS" LIBS="" diff --git a/src/amuse_simplex/support/configure.ac b/src/amuse_simplex/support/configure.ac index c8523c8401..d8de2627b4 100644 --- a/src/amuse_simplex/support/configure.ac +++ b/src/amuse_simplex/support/configure.ac @@ -29,6 +29,7 @@ AX_MPI() AX_PATH_GSL(1.0, [FOUND_GSL=yes]) AX_LIB_HDF5() +AMUSE_LIBZ() AMUSE_LIB_QHULL() AMUSE_LIB_HEALPIX_CXX() diff --git a/support/aclocal.m4 b/support/aclocal.m4 index d16661c0cb..6fe6686bce 100644 --- a/support/aclocal.m4 +++ b/support/aclocal.m4 @@ -18,6 +18,7 @@ m4_include([shared/m4/amuse_download.m4]) m4_include([shared/m4/amuse_lib.m4]) m4_include([shared/m4/amuse_lib_healpix.m4]) m4_include([shared/m4/amuse_lib_qhull.m4]) +m4_include([shared/m4/amuse_libz.m4]) m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_opencl.m4]) m4_include([shared/m4/ax_blas.m4]) diff --git a/support/configure b/support/configure index 6ac2648360..4090fd8e32 100755 --- a/support/configure +++ b/support/configure @@ -741,6 +741,8 @@ H5FC H5CC GREP SED +LIBZ_LIBS +LIBZ_CFLAGS FFTW_FLAGS FOUND_FFTW FFTW_LIBS @@ -4509,6 +4511,27 @@ else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } +fi + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for conda package zlib" >&5 +printf %s "checking for conda package zlib... " >&6; } + ax_conda_package_line="$(echo $amuse_conda_list | tr '^' '\n' | grep '^zlib ')" + if test "$?" = "0" +then : + + # FOUND_LIBZ="$(AS_ECHO("$ax_conda_package_line") | tr -s ' ' | cut -f 2 -d ' ')" + + FOUND_LIBZ="yes" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi @@ -13551,6 +13574,73 @@ fi + + amuse_libz_save_libs="$LIBS" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libz" >&5 +printf %s "checking for libz... " >&6; } + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + LIBS="-lz" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + +#ifdef F77_DUMMY_MAIN + +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } + +#endif +int +main (void) +{ + + z_stream strm; + deflateInit(&strm, 0); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + FOUND_LIBZ="yes" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 printf %s "checking for a sed that does not truncate output... " >&6; } if test ${ac_cv_path_SED+y} @@ -15510,6 +15600,10 @@ if test "x${FOUND_FFTW}" = "xyes" then : FEATURES="${FEATURES} fftw" fi +if test "x${FOUND_LIBZ}" = "xyes" +then : + FEATURES="${FEATURES} libz" +fi if test "x" != "x${with_hdf5}" then : FEATURES="${FEATURES} hdf5" diff --git a/support/configure.ac b/support/configure.ac index 485dddfba1..27eec6e85e 100644 --- a/support/configure.ac +++ b/support/configure.ac @@ -84,6 +84,7 @@ else AMUSE_CONDA_PACKAGE(FOUND_GMP, gmp) AMUSE_CONDA_PACKAGE(FOUND_MPFR, mpfr) AMUSE_CONDA_PACKAGE(FOUND_FFTW, fftw) + AMUSE_CONDA_PACKAGE(FOUND_LIBZ, zlib) AMUSE_CONDA_PACKAGE(with_hdf5, hdf5) AMUSE_CONDA_PACKAGE(FOUND_NETCDF, netcdf4) AMUSE_CONDA_PACKAGE(FOUND_QHULL, qhull) @@ -162,6 +163,7 @@ else AX_GMP() AX_MPFR() AX_FFTW() + AMUSE_LIBZ() AX_LIB_HDF5() AX_LIB_NETCDF4() AMUSE_LIB_QHULL() @@ -221,6 +223,7 @@ ENABLE_FEATURE_IF_DEFINED([gsl], [FOUND_GSL]) ENABLE_FEATURE_IF_EQUALS([gmp], [FOUND_GMP], [yes]) ENABLE_FEATURE_IF_EQUALS([mpfr], [FOUND_MPFR], [yes]) ENABLE_FEATURE_IF_EQUALS([fftw], [FOUND_FFTW], [yes]) +ENABLE_FEATURE_IF_EQUALS([libz], [FOUND_LIBZ], [yes]) ENABLE_FEATURE_IF_DEFINED([hdf5], [with_hdf5]) ENABLE_FEATURE_IF_EQUALS([netcdf4], [FOUND_NETCDF], [yes]) ENABLE_FEATURE_IF_EQUALS([qhull], [FOUND_QHULL], [yes]) diff --git a/support/setup/dependencies.sh b/support/setup/dependencies.sh index 0dcde64c2c..44ad5be6a1 100644 --- a/support/setup/dependencies.sh +++ b/support/setup/dependencies.sh @@ -30,6 +30,7 @@ # - HEALPix C++ # - BLAS # - LAPACK +# - zlib # MESA r15140 fails its tests when compiled with gfortran 14 @@ -43,6 +44,7 @@ DEPS_conda="${DEPS_conda} 'h5py>=1.1.0'" DEPS_macports="gcc12 python312 pkgconfig curl gpatch gnutar unzip gzip bzip2 xz perl5" DEPS_macports="${DEPS_macports} gmake cmake openmpi-gcc12 gsl fftw-3 gmp mpfr hdf5" DEPS_macports="${DEPS_macports} netcdf netcdf-fortran qhull healpix-cxx openblas lapack" +DEPS_macports="${DEPS_macports} zlib" DEPS_POST_macports=" @@ -55,21 +57,24 @@ DEPS_homebrew="gcc@13 python pkg-config curl gpatch gnu-tar unzip gzip" DEPS_homebrew="${DEPS_homebrew} bzip2 xz" DEPS_homebrew="${DEPS_homebrew} perl bison make cmake open-mpi gsl fftw gmp mpfr hdf5" DEPS_homebrew="${DEPS_homebrew} netcdf netcdf-cxx netcdf-fortran qhull healpix openblas" -DEPS_homebrew="${DEPS_homebrew} lapack" +DEPS_homebrew="${DEPS_homebrew} lapack zlib" DEPS_apt="gcc g++ gfortran python3 python3-dev pkg-config curl patch tar unzip gzip" DEPS_apt="${DEPS_apt} bzip2 xz-utils" DEPS_apt="${DEPS_apt} perl bison make cmake libopenmpi-dev openmpi-bin" DEPS_apt="${DEPS_apt} libgsl-dev libfftw3-dev libgmp3-dev libmpfr6" DEPS_apt="${DEPS_apt} libmpfr-dev libhdf5-dev hdf5-tools libnetcdf-dev libqhull-dev" -DEPS_apt="${DEPS_apt} libhealpix-cxx-dev liblapack-dev libblas-dev" +DEPS_apt="${DEPS_apt} libhealpix-cxx-dev liblapack-dev libblas-dev zlib1g-dev" DEPS_dnf="gcc gcc-c++ gcc-gfortran python3 python3-devel pkgconf-pkg-config curl patch" DEPS_dnf="${DEPS_dnf} tar unzip gzip" DEPS_dnf="${DEPS_dnf} bzip2 xz perl-core bison make cmake openmpi-devel" DEPS_dnf="${DEPS_dnf} gsl-devel fftw-devel gmp-devel mpfr-devel hdf5-devel netcdf-devel" DEPS_dnf="${DEPS_dnf} netcdf-cxx-devel netcdf-fortran-devel healpix-devel" -DEPS_dnf="${DEPS_dnf} libqhull-devel blas-devel lapack-devel" +DEPS_dnf="${DEPS_dnf} libqhull-devel blas-devel lapack-devel zlib-devel" + +# Note: Fedora 40 has replaced zlib-devel with zlib-ng-compat-devel. RHEL is still on +# the old name. We should probably switch at some point. # Help messages for the user, used by help.sh diff --git a/support/shared/m4/amuse_libz.m4 b/support/shared/m4/amuse_libz.m4 new file mode 100644 index 0000000000..be01f7cfab --- /dev/null +++ b/support/shared/m4/amuse_libz.m4 @@ -0,0 +1,41 @@ +# Helper macro for detecting libz +# +# AMUSE_LIBZ() +# +# Searches for libz and sets FOUND_LIBZ to "yes" if found. +# +# There exists an AX_CHECK_ZLIB on the Autoconf Archive, but it checks specific +# directories instead of at least trying without specifying a directory first. As a +# result, it'll find a libz on the system even if we're in a Conda environment for +# example. This only searches in the default locations, relying on the package or +# environment manager to add appropriate flags to CPPFLAGS and LDFLAGS if needed. +# +AC_DEFUN([AMUSE_LIBZ], [ + amuse_libz_save_libs="$LIBS" + + AC_MSG_CHECKING([for libz]) + + AC_LANG_PUSH([C]) + + LIBS="-lz" + + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([ + #include + ], [ + z_stream strm; + deflateInit(&strm, 0); + ]) + ], [ + FOUND_LIBZ="yes" + AC_MSG_RESULT([yes]) + ], [ + AC_MSG_RESULT([no]) + ]) + + AC_LANG_POP([C]) + + AC_SUBST([LIBZ_CFLAGS]) + AC_SUBST([LIBZ_LIBS]) +]) + From baa215b5849a605d04c0f87917e10f43c929f80f Mon Sep 17 00:00:00 2001 From: Lourens Veen Date: Fri, 13 Mar 2026 09:21:28 +0100 Subject: [PATCH 2/2] Fix gsl and improve hdf5 detection without Conda --- support/configure | 6 +++--- support/configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/support/configure b/support/configure index 4090fd8e32..90ef1407fd 100755 --- a/support/configure +++ b/support/configure @@ -3119,7 +3119,7 @@ then # we assume that the conda metadata is correct, and that if it isn't there's # an expert packager who can fix things. printf "%s\n" "Conda package build detected, skipping checks for dependencies." - ASSUME_FEATURES="c c++ fortran java python tar unzip gunzip bunzip2 unxz bison perl gmake cmake install download mpi openmp cuda opencl blas lapack gsl gmp mpfr fftw hdf5 netcdf4 sapporo_light" + ASSUME_FEATURES="c c++ fortran java python tar unzip gunzip bunzip2 unxz bison perl gmake cmake install download mpi openmp cuda opencl blas lapack gsl gmp mpfr fftw hdf5 libz netcdf4 sapporo_light" else if test "x" != "x$CONDA_DEFAULT_ENV" @@ -15584,7 +15584,7 @@ if test "x" != "x${HAVE_LAPACK}" then : FEATURES="${FEATURES} lapack" fi -if test "x" != "x${FOUND_GSL}" +if test "x${FOUND_GSL}" = "xyes" then : FEATURES="${FEATURES} gsl" fi @@ -15604,7 +15604,7 @@ if test "x${FOUND_LIBZ}" = "xyes" then : FEATURES="${FEATURES} libz" fi -if test "x" != "x${with_hdf5}" +if test "x${with_hdf5}" = "xyes" then : FEATURES="${FEATURES} hdf5" fi diff --git a/support/configure.ac b/support/configure.ac index 27eec6e85e..a1662b322f 100644 --- a/support/configure.ac +++ b/support/configure.ac @@ -23,7 +23,7 @@ then # we assume that the conda metadata is correct, and that if it isn't there's # an expert packager who can fix things. AS_ECHO(["Conda package build detected, skipping checks for dependencies."]) - ASSUME_FEATURES="c c++ fortran java python tar unzip gunzip bunzip2 unxz bison perl gmake cmake install download mpi openmp cuda opencl blas lapack gsl gmp mpfr fftw hdf5 netcdf4 sapporo_light" + ASSUME_FEATURES="c c++ fortran java python tar unzip gunzip bunzip2 unxz bison perl gmake cmake install download mpi openmp cuda opencl blas lapack gsl gmp mpfr fftw hdf5 libz netcdf4 sapporo_light" else if test "x" != "x$CONDA_DEFAULT_ENV" @@ -219,12 +219,12 @@ ENABLE_FEATURE_IF_DEFINED([cuda], [CUDA_TK]) ENABLE_FEATURE_IF_EQUALS([opencl], [FOUND_OPENCL], [yes]) ENABLE_FEATURE_IF_DEFINED([blas], [BLAS_LIBS]) ENABLE_FEATURE_IF_DEFINED([lapack], [HAVE_LAPACK]) -ENABLE_FEATURE_IF_DEFINED([gsl], [FOUND_GSL]) +ENABLE_FEATURE_IF_EQUALS([gsl], [FOUND_GSL], [yes]) ENABLE_FEATURE_IF_EQUALS([gmp], [FOUND_GMP], [yes]) ENABLE_FEATURE_IF_EQUALS([mpfr], [FOUND_MPFR], [yes]) ENABLE_FEATURE_IF_EQUALS([fftw], [FOUND_FFTW], [yes]) ENABLE_FEATURE_IF_EQUALS([libz], [FOUND_LIBZ], [yes]) -ENABLE_FEATURE_IF_DEFINED([hdf5], [with_hdf5]) +ENABLE_FEATURE_IF_EQUALS([hdf5], [with_hdf5], [yes]) ENABLE_FEATURE_IF_EQUALS([netcdf4], [FOUND_NETCDF], [yes]) ENABLE_FEATURE_IF_EQUALS([qhull], [FOUND_QHULL], [yes]) ENABLE_FEATURE_IF_EQUALS([healpix-cxx], [FOUND_HEALPIX_CXX], [yes])