Add libz as an explicit dependency for SimpleX and MESA r15140

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

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])

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 <zlib.h>
+
+#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'

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])
 

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

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])

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 <zlib.h>
+
+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=""

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()
 

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])

support/configure

@@ -741,6 +741,8 @@ H5FC
 H5CC
 GREP
 SED
+LIBZ_LIBS
+LIBZ_CFLAGS
 FFTW_FLAGS
 FOUND_FFTW
 FFTW_LIBS
@@ -3117,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"
@@ -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 <zlib.h>
+
+#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}
@@ -15494,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
@@ -15510,7 +15600,11 @@ if test "x${FOUND_FFTW}" = "xyes"
 then :
   FEATURES="${FEATURES} fftw"
 fi
-if test "x" != "x${with_hdf5}"
+if test "x${FOUND_LIBZ}" = "xyes"
+then :
+  FEATURES="${FEATURES} libz"
+fi
+if test "x${with_hdf5}" = "xyes"
 then :
   FEATURES="${FEATURES} hdf5"
 fi

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"
@@ -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()
@@ -217,11 +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_DEFINED([hdf5], [with_hdf5])
+ENABLE_FEATURE_IF_EQUALS([libz], [FOUND_LIBZ], [yes])
+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])