From db817daa158f944c6a03bc6d115c48d7990de266 Mon Sep 17 00:00:00 2001 From: Lourens Veen Date: Thu, 12 Mar 2026 22:10:11 +0100 Subject: [PATCH] Show envvars in config.log everywhere --- lib/amuse_mpi/support/aclocal.m4 | 1 + lib/amuse_mpi/support/configure | 13 +++++++++++++ lib/amuse_mpi/support/configure.ac | 2 ++ lib/forsockets/support/aclocal.m4 | 1 + lib/forsockets/support/configure | 13 +++++++++++++ lib/forsockets/support/configure.ac | 2 ++ lib/g6lib/support/aclocal.m4 | 1 + lib/g6lib/support/configure | 13 +++++++++++++ lib/g6lib/support/configure.ac | 2 ++ lib/sapporo_light/support/aclocal.m4 | 1 + lib/sapporo_light/support/configure | 13 +++++++++++++ lib/sapporo_light/support/configure.ac | 2 ++ lib/simple_hash/support/aclocal.m4 | 1 + lib/simple_hash/support/configure | 13 +++++++++++++ lib/simple_hash/support/configure.ac | 2 ++ lib/stopcond/support/aclocal.m4 | 1 + lib/stopcond/support/configure | 13 +++++++++++++ lib/stopcond/support/configure.ac | 2 ++ .../rfi/tools/dir_templates/configure_cxx.ac | 2 ++ .../tools/dir_templates/configure_fortran.ac | 2 ++ src/amuse_aarsethzare/support/aclocal.m4 | 1 + src/amuse_aarsethzare/support/configure | 13 +++++++++++++ src/amuse_aarsethzare/support/configure.ac | 2 ++ src/amuse_adaptb/support/aclocal.m4 | 1 + src/amuse_adaptb/support/configure | 13 +++++++++++++ src/amuse_adaptb/support/configure.ac | 2 ++ src/amuse_athena/support/aclocal.m4 | 1 + src/amuse_athena/support/configure | 13 +++++++++++++ src/amuse_athena/support/configure.ac | 2 ++ src/amuse_bhtree/support/aclocal.m4 | 1 + src/amuse_bhtree/support/configure | 14 +++++++++++++- src/amuse_bhtree/support/configure.ac | 3 ++- src/amuse_brutus/support/aclocal.m4 | 1 + src/amuse_brutus/support/configure | 13 +++++++++++++ src/amuse_brutus/support/configure.ac | 2 ++ src/amuse_bse/support/aclocal.m4 | 1 + src/amuse_bse/support/configure | 13 +++++++++++++ src/amuse_bse/support/configure.ac | 2 ++ src/amuse_capreole/support/aclocal.m4 | 1 + src/amuse_capreole/support/configure | 13 +++++++++++++ src/amuse_capreole/support/configure.ac | 2 ++ src/amuse_etics/support/aclocal.m4 | 1 + src/amuse_etics/support/configure | 13 +++++++++++++ src/amuse_etics/support/configure.ac | 2 ++ src/amuse_evtwin/support/aclocal.m4 | 1 + src/amuse_evtwin/support/configure | 14 +++++++++++++- src/amuse_evtwin/support/configure.ac | 3 ++- src/amuse_fastkick/support/aclocal.m4 | 1 + src/amuse_fastkick/support/configure.ac | 2 ++ src/amuse_fi/support/aclocal.m4 | 1 + src/amuse_fi/support/configure | 12 ++++++++++++ src/amuse_fi/support/configure.ac | 1 + src/amuse_fractalcluster/support/aclocal.m4 | 1 + src/amuse_fractalcluster/support/configure | 13 +++++++++++++ src/amuse_fractalcluster/support/configure.ac | 2 ++ src/amuse_gadget2/support/aclocal.m4 | 1 + src/amuse_gadget2/support/configure | 13 +++++++++++++ src/amuse_gadget2/support/configure.ac | 2 ++ src/amuse_galactics/support/aclocal.m4 | 1 + src/amuse_galactics/support/configure | 13 +++++++++++++ src/amuse_galactics/support/configure.ac | 2 ++ src/amuse_galaxia/support/aclocal.m4 | 1 + src/amuse_galaxia/support/configure | 13 +++++++++++++ src/amuse_galaxia/support/configure.ac | 2 ++ src/amuse_halogen/support/aclocal.m4 | 1 + src/amuse_halogen/support/configure | 13 +++++++++++++ src/amuse_halogen/support/configure.ac | 2 ++ src/amuse_hermite/support/aclocal.m4 | 1 + src/amuse_hermite/support/configure | 13 +++++++++++++ src/amuse_hermite/support/configure.ac | 2 ++ src/amuse_hermite_grx/support/aclocal.m4 | 1 + src/amuse_hermite_grx/support/configure | 13 +++++++++++++ src/amuse_hermite_grx/support/configure.ac | 2 ++ src/amuse_higpus/support/aclocal.m4 | 1 + src/amuse_higpus/support/configure | 13 +++++++++++++ src/amuse_higpus/support/configure.ac | 2 ++ src/amuse_hop/support/aclocal.m4 | 1 + src/amuse_hop/support/configure | 13 +++++++++++++ src/amuse_hop/support/configure.ac | 2 ++ src/amuse_huayno/support/aclocal.m4 | 1 + src/amuse_huayno/support/configure | 13 +++++++++++++ src/amuse_huayno/support/configure.ac | 2 ++ src/amuse_kepler/support/aclocal.m4 | 1 + src/amuse_kepler/support/configure | 13 +++++++++++++ src/amuse_kepler/support/configure.ac | 2 ++ src/amuse_kepler_orbiters/support/aclocal.m4 | 1 + src/amuse_kepler_orbiters/support/configure.ac | 2 ++ src/amuse_krome/support/aclocal.m4 | 1 + src/amuse_krome/support/configure | 13 +++++++++++++ src/amuse_krome/support/configure.ac | 2 ++ src/amuse_mameclot/support/aclocal.m4 | 1 + src/amuse_mameclot/support/configure | 13 +++++++++++++ src/amuse_mameclot/support/configure.ac | 2 ++ src/amuse_mercury/support/aclocal.m4 | 1 + src/amuse_mercury/support/configure | 13 +++++++++++++ src/amuse_mercury/support/configure.ac | 2 ++ src/amuse_mesa_r15140/support/aclocal.m4 | 1 + src/amuse_mesa_r15140/support/configure | 13 +++++++++++++ src/amuse_mesa_r15140/support/configure.ac | 2 ++ src/amuse_mesa_r2208/support/aclocal.m4 | 1 + src/amuse_mesa_r2208/support/configure | 13 +++++++++++++ src/amuse_mesa_r2208/support/configure.ac | 2 ++ src/amuse_mi6/support/aclocal.m4 | 1 + src/amuse_mi6/support/configure | 13 +++++++++++++ src/amuse_mi6/support/configure.ac | 2 ++ src/amuse_mikkola/support/aclocal.m4 | 1 + src/amuse_mikkola/support/configure | 13 +++++++++++++ src/amuse_mikkola/support/configure.ac | 2 ++ src/amuse_mmams/support/aclocal.m4 | 1 + src/amuse_mmams/support/configure | 13 +++++++++++++ src/amuse_mmams/support/configure.ac | 2 ++ src/amuse_mobse/support/aclocal.m4 | 1 + src/amuse_mobse/support/configure | 14 ++++++++++++++ src/amuse_mobse/support/configure.ac | 4 +++- src/amuse_mocassin/support/aclocal.m4 | 1 + src/amuse_mocassin/support/configure | 13 +++++++++++++ src/amuse_mocassin/support/configure.ac | 2 ++ src/amuse_mosse/support/aclocal.m4 | 1 + src/amuse_mosse/support/configure | 14 ++++++++++++++ src/amuse_mosse/support/configure.ac | 4 +++- src/amuse_mpiamrvac/support/aclocal.m4 | 1 + src/amuse_mpiamrvac/support/configure.ac | 2 ++ src/amuse_nbody6xx/support/aclocal.m4 | 1 + src/amuse_nbody6xx/support/configure | 13 +++++++++++++ src/amuse_nbody6xx/support/configure.ac | 2 ++ src/amuse_petar/support/aclocal.m4 | 1 + src/amuse_petar/support/configure.ac | 2 ++ src/amuse_ph4/support/aclocal.m4 | 1 + src/amuse_ph4/support/configure | 13 +++++++++++++ src/amuse_ph4/support/configure.ac | 2 ++ src/amuse_phantom/support/aclocal.m4 | 1 + src/amuse_phantom/support/configure | 13 +++++++++++++ src/amuse_phantom/support/configure.ac | 2 ++ src/amuse_phigrape/support/aclocal.m4 | 1 + src/amuse_phigrape/support/configure.ac | 2 ++ src/amuse_rebound/support/aclocal.m4 | 1 + src/amuse_rebound/support/configure | 13 +++++++++++++ src/amuse_rebound/support/configure.ac | 2 ++ src/amuse_sakura/support/aclocal.m4 | 1 + src/amuse_sakura/support/configure.ac | 2 ++ src/amuse_seba/support/aclocal.m4 | 1 + src/amuse_seba/support/configure | 13 +++++++++++++ src/amuse_seba/support/configure.ac | 2 ++ src/amuse_secularmultiple/support/aclocal.m4 | 1 + src/amuse_secularmultiple/support/configure | 13 +++++++++++++ src/amuse_secularmultiple/support/configure.ac | 2 ++ src/amuse_sei/support/aclocal.m4 | 1 + src/amuse_sei/support/configure | 13 +++++++++++++ src/amuse_sei/support/configure.ac | 2 ++ src/amuse_simplex/support/aclocal.m4 | 1 + src/amuse_simplex/support/configure | 13 +++++++++++++ src/amuse_simplex/support/configure.ac | 2 ++ src/amuse_smalln/support/aclocal.m4 | 1 + src/amuse_smalln/support/configure | 13 +++++++++++++ src/amuse_smalln/support/configure.ac | 2 ++ src/amuse_sphray/support/aclocal.m4 | 1 + src/amuse_sphray/support/configure | 13 +++++++++++++ src/amuse_sphray/support/configure.ac | 2 ++ src/amuse_sse/support/aclocal.m4 | 1 + src/amuse_sse/support/configure | 13 +++++++++++++ src/amuse_sse/support/configure.ac | 2 ++ src/amuse_symple/support/aclocal.m4 | 1 + src/amuse_symple/support/configure | 13 +++++++++++++ src/amuse_symple/support/configure.ac | 2 ++ src/amuse_tupan/support/aclocal.m4 | 1 + src/amuse_tupan/support/configure.ac | 2 ++ src/amuse_twobody/support/aclocal.m4 | 1 + src/amuse_twobody/support/configure | 13 +++++++++++++ src/amuse_twobody/support/configure.ac | 2 ++ src/amuse_vader/support/aclocal.m4 | 1 + src/amuse_vader/support/configure | 13 +++++++++++++ src/amuse_vader/support/configure.ac | 2 ++ src/tests/support/aclocal.m4 | 1 + src/tests/support/configure | 13 +++++++++++++ src/tests/support/configure.ac | 2 ++ support/aclocal.m4 | 1 + support/configure | 13 +++++++++++++ support/configure.ac | 2 ++ support/shared/m4/amuse_log_envvars.m4 | 17 +++++++++++++++++ 179 files changed, 908 insertions(+), 6 deletions(-) create mode 100644 support/shared/m4/amuse_log_envvars.m4 diff --git a/lib/amuse_mpi/support/aclocal.m4 b/lib/amuse_mpi/support/aclocal.m4 index ef4a4efd6a..12fac7a2fc 100644 --- a/lib/amuse_mpi/support/aclocal.m4 +++ b/lib/amuse_mpi/support/aclocal.m4 @@ -13,4 +13,5 @@ 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_detect_os.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/lib/amuse_mpi/support/configure b/lib/amuse_mpi/support/configure index 4da861ff46..fc004ef085 100755 --- a/lib/amuse_mpi/support/configure +++ b/lib/amuse_mpi/support/configure @@ -2326,6 +2326,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + + # Make sure we can run config.sub. diff --git a/lib/amuse_mpi/support/configure.ac b/lib/amuse_mpi/support/configure.ac index 6e24f7017f..f71ddd555a 100644 --- a/lib/amuse_mpi/support/configure.ac +++ b/lib/amuse_mpi/support/configure.ac @@ -1,6 +1,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-lib-amuse_mpi], [1.0]) +AMUSE_LOG_ENVVARS() + AMUSE_DETECT_OS() AC_PROG_CC() diff --git a/lib/forsockets/support/aclocal.m4 b/lib/forsockets/support/aclocal.m4 index e2f6689116..0c66fa56ca 100644 --- a/lib/forsockets/support/aclocal.m4 +++ b/lib/forsockets/support/aclocal.m4 @@ -13,4 +13,5 @@ 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_detect_os.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/fortran.m4]) diff --git a/lib/forsockets/support/configure b/lib/forsockets/support/configure index aab0d43105..8c12d22926 100755 --- a/lib/forsockets/support/configure +++ b/lib/forsockets/support/configure @@ -2304,6 +2304,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + + # Make sure we can run config.sub. diff --git a/lib/forsockets/support/configure.ac b/lib/forsockets/support/configure.ac index e2b74a92e5..2b76ac2de2 100644 --- a/lib/forsockets/support/configure.ac +++ b/lib/forsockets/support/configure.ac @@ -1,6 +1,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-lib-forsockets], [1.0]) +AMUSE_LOG_ENVVARS() + AMUSE_DETECT_OS() AC_PROG_CC() diff --git a/lib/g6lib/support/aclocal.m4 b/lib/g6lib/support/aclocal.m4 index 1e0a28b702..9ba966b2e1 100644 --- a/lib/g6lib/support/aclocal.m4 +++ b/lib/g6lib/support/aclocal.m4 @@ -13,3 +13,4 @@ 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_detect_os.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) diff --git a/lib/g6lib/support/configure b/lib/g6lib/support/configure index c154909a3b..3c49791bf3 100755 --- a/lib/g6lib/support/configure +++ b/lib/g6lib/support/configure @@ -2211,6 +2211,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + + # Make sure we can run config.sub. diff --git a/lib/g6lib/support/configure.ac b/lib/g6lib/support/configure.ac index c658685deb..18478e3a19 100644 --- a/lib/g6lib/support/configure.ac +++ b/lib/g6lib/support/configure.ac @@ -1,6 +1,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-lib-g6], [1.0]) +AMUSE_LOG_ENVVARS() + AMUSE_DETECT_OS() AC_PROG_CC() diff --git a/lib/sapporo_light/support/aclocal.m4 b/lib/sapporo_light/support/aclocal.m4 index 48a06a59cd..c1d2730168 100644 --- a/lib/sapporo_light/support/aclocal.m4 +++ b/lib/sapporo_light/support/aclocal.m4 @@ -14,3 +14,4 @@ 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_cuda.m4]) m4_include([shared/m4/amuse_detect_os.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) diff --git a/lib/sapporo_light/support/configure b/lib/sapporo_light/support/configure index 4255f8d649..3335ae36c1 100755 --- a/lib/sapporo_light/support/configure +++ b/lib/sapporo_light/support/configure @@ -2528,6 +2528,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + + # Make sure we can run config.sub. diff --git a/lib/sapporo_light/support/configure.ac b/lib/sapporo_light/support/configure.ac index 2ffe7f0fa4..67f783f90b 100644 --- a/lib/sapporo_light/support/configure.ac +++ b/lib/sapporo_light/support/configure.ac @@ -1,6 +1,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-lib-stopcond], [1.0]) +AMUSE_LOG_ENVVARS() + AMUSE_DETECT_OS() AC_PROG_CC() diff --git a/lib/simple_hash/support/aclocal.m4 b/lib/simple_hash/support/aclocal.m4 index 1e0a28b702..9ba966b2e1 100644 --- a/lib/simple_hash/support/aclocal.m4 +++ b/lib/simple_hash/support/aclocal.m4 @@ -13,3 +13,4 @@ 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_detect_os.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) diff --git a/lib/simple_hash/support/configure b/lib/simple_hash/support/configure index 111ed4480c..f4be70101f 100755 --- a/lib/simple_hash/support/configure +++ b/lib/simple_hash/support/configure @@ -2212,6 +2212,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + + # Make sure we can run config.sub. diff --git a/lib/simple_hash/support/configure.ac b/lib/simple_hash/support/configure.ac index 2ec34d7af7..50aed5852f 100644 --- a/lib/simple_hash/support/configure.ac +++ b/lib/simple_hash/support/configure.ac @@ -1,6 +1,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-lib-simple_hash], [1.0]) +AMUSE_LOG_ENVVARS() + AMUSE_DETECT_OS() AC_PROG_CC() diff --git a/lib/stopcond/support/aclocal.m4 b/lib/stopcond/support/aclocal.m4 index 2e833539b9..db80cb800d 100644 --- a/lib/stopcond/support/aclocal.m4 +++ b/lib/stopcond/support/aclocal.m4 @@ -13,5 +13,6 @@ 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_detect_os.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/ax_mpi.m4]) m4_include([shared/m4/fortran.m4]) diff --git a/lib/stopcond/support/configure b/lib/stopcond/support/configure index f5e16e40d4..3e1b7cee35 100755 --- a/lib/stopcond/support/configure +++ b/lib/stopcond/support/configure @@ -2424,6 +2424,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + + # Make sure we can run config.sub. diff --git a/lib/stopcond/support/configure.ac b/lib/stopcond/support/configure.ac index 40989786b3..d009b7c260 100644 --- a/lib/stopcond/support/configure.ac +++ b/lib/stopcond/support/configure.ac @@ -1,6 +1,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-lib-stopcond], [1.0]) +AMUSE_LOG_ENVVARS() + AMUSE_DETECT_OS() AC_PROG_CC() diff --git a/src/amuse/rfi/tools/dir_templates/configure_cxx.ac b/src/amuse/rfi/tools/dir_templates/configure_cxx.ac index 0071324928..7eda4c4c0e 100644 --- a/src/amuse/rfi/tools/dir_templates/configure_cxx.ac +++ b/src/amuse/rfi/tools/dir_templates/configure_cxx.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-{code}], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse/rfi/tools/dir_templates/configure_fortran.ac b/src/amuse/rfi/tools/dir_templates/configure_fortran.ac index 4e5bce9e91..cad2b39e77 100644 --- a/src/amuse/rfi/tools/dir_templates/configure_fortran.ac +++ b/src/amuse/rfi/tools/dir_templates/configure_fortran.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-{code}], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_aarsethzare/support/aclocal.m4 b/src/amuse_aarsethzare/support/aclocal.m4 index a0863e8de2..5bff04a8b4 100644 --- a/src/amuse_aarsethzare/support/aclocal.m4 +++ b/src/amuse_aarsethzare/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_mpi.m4]) m4_include([shared/m4/fortran.m4]) diff --git a/src/amuse_aarsethzare/support/configure b/src/amuse_aarsethzare/support/configure index 661080fd8e..e8869ffac8 100755 --- a/src/amuse_aarsethzare/support/configure +++ b/src/amuse_aarsethzare/support/configure @@ -2381,6 +2381,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_aarsethzare/support/configure.ac b/src/amuse_aarsethzare/support/configure.ac index 70bb666e42..85bf9f2c34 100644 --- a/src/amuse_aarsethzare/support/configure.ac +++ b/src/amuse_aarsethzare/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-aarsethzare], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_adaptb/support/aclocal.m4 b/src/amuse_adaptb/support/aclocal.m4 index 1b1243d9fa..9a4c44aee1 100644 --- a/src/amuse_adaptb/support/aclocal.m4 +++ b/src/amuse_adaptb/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_adaptb/support/configure b/src/amuse_adaptb/support/configure index 296aecbe62..0c2c194e0e 100755 --- a/src/amuse_adaptb/support/configure +++ b/src/amuse_adaptb/support/configure @@ -2752,6 +2752,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_adaptb/support/configure.ac b/src/amuse_adaptb/support/configure.ac index e26b4fb781..8c7b17acfe 100644 --- a/src/amuse_adaptb/support/configure.ac +++ b/src/amuse_adaptb/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-adaptb], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_athena/support/aclocal.m4 b/src/amuse_athena/support/aclocal.m4 index f2dbf6231a..600c3e39a0 100644 --- a/src/amuse_athena/support/aclocal.m4 +++ b/src/amuse_athena/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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_athena/support/configure b/src/amuse_athena/support/configure index b8ddfa4830..03381e7c2e 100755 --- a/src/amuse_athena/support/configure +++ b/src/amuse_athena/support/configure @@ -2822,6 +2822,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_athena/support/configure.ac b/src/amuse_athena/support/configure.ac index ff1fcf870f..a0fa2f7945 100644 --- a/src/amuse_athena/support/configure.ac +++ b/src/amuse_athena/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-athena], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_bhtree/support/aclocal.m4 b/src/amuse_bhtree/support/aclocal.m4 index 5fea1010bd..61fa60233e 100644 --- a/src/amuse_bhtree/support/aclocal.m4 +++ b/src/amuse_bhtree/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_bhtree/support/configure b/src/amuse_bhtree/support/configure index b9e12f1942..b174b1d83c 100755 --- a/src/amuse_bhtree/support/configure +++ b/src/amuse_bhtree/support/configure @@ -2730,6 +2730,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x @@ -2759,7 +2772,6 @@ fi - # Set CPU_COUNT diff --git a/src/amuse_bhtree/support/configure.ac b/src/amuse_bhtree/support/configure.ac index f0c5a14286..71ac4647ae 100644 --- a/src/amuse_bhtree/support/configure.ac +++ b/src/amuse_bhtree/support/configure.ac @@ -3,10 +3,11 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-bhtree], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() - # Set CPU_COUNT AX_COUNT_CPUS() AC_SUBST(CPU_COUNT) diff --git a/src/amuse_brutus/support/aclocal.m4 b/src/amuse_brutus/support/aclocal.m4 index 1b1243d9fa..9a4c44aee1 100644 --- a/src/amuse_brutus/support/aclocal.m4 +++ b/src/amuse_brutus/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_brutus/support/configure b/src/amuse_brutus/support/configure index edb4392b35..d4fa2e07bf 100755 --- a/src/amuse_brutus/support/configure +++ b/src/amuse_brutus/support/configure @@ -2852,6 +2852,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_brutus/support/configure.ac b/src/amuse_brutus/support/configure.ac index f53bbbcc65..2df019c6a5 100644 --- a/src/amuse_brutus/support/configure.ac +++ b/src/amuse_brutus/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-brutus], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_bse/support/aclocal.m4 b/src/amuse_bse/support/aclocal.m4 index 8161803730..ee7ad4436c 100644 --- a/src/amuse_bse/support/aclocal.m4 +++ b/src/amuse_bse/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_bse/support/configure b/src/amuse_bse/support/configure index 7042de5b02..a4e9d4a8ff 100755 --- a/src/amuse_bse/support/configure +++ b/src/amuse_bse/support/configure @@ -2368,6 +2368,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_bse/support/configure.ac b/src/amuse_bse/support/configure.ac index daa74aff4e..3b74537625 100644 --- a/src/amuse_bse/support/configure.ac +++ b/src/amuse_bse/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-bse], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_capreole/support/aclocal.m4 b/src/amuse_capreole/support/aclocal.m4 index 8161803730..ee7ad4436c 100644 --- a/src/amuse_capreole/support/aclocal.m4 +++ b/src/amuse_capreole/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_capreole/support/configure b/src/amuse_capreole/support/configure index ef62d38f1d..16cdb7d55d 100755 --- a/src/amuse_capreole/support/configure +++ b/src/amuse_capreole/support/configure @@ -2384,6 +2384,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_capreole/support/configure.ac b/src/amuse_capreole/support/configure.ac index 8a1b0794f4..ad5b68a1b2 100644 --- a/src/amuse_capreole/support/configure.ac +++ b/src/amuse_capreole/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-capreole], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_etics/support/aclocal.m4 b/src/amuse_etics/support/aclocal.m4 index 4d5a39444b..061bce8c6b 100644 --- a/src/amuse_etics/support/aclocal.m4 +++ b/src/amuse_etics/support/aclocal.m4 @@ -13,6 +13,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_cuda.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_lib_hdf5.m4]) diff --git a/src/amuse_etics/support/configure b/src/amuse_etics/support/configure index bc2e2d2fb7..bcb8ab5bae 100755 --- a/src/amuse_etics/support/configure +++ b/src/amuse_etics/support/configure @@ -2733,6 +2733,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_etics/support/configure.ac b/src/amuse_etics/support/configure.ac index 32597bd3a5..6866e5bd9a 100644 --- a/src/amuse_etics/support/configure.ac +++ b/src/amuse_etics/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-etics], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_evtwin/support/aclocal.m4 b/src/amuse_evtwin/support/aclocal.m4 index a0863e8de2..5bff04a8b4 100644 --- a/src/amuse_evtwin/support/aclocal.m4 +++ b/src/amuse_evtwin/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_mpi.m4]) m4_include([shared/m4/fortran.m4]) diff --git a/src/amuse_evtwin/support/configure b/src/amuse_evtwin/support/configure index 794e6c92dc..3b210a2a20 100755 --- a/src/amuse_evtwin/support/configure +++ b/src/amuse_evtwin/support/configure @@ -2371,6 +2371,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x @@ -2400,7 +2413,6 @@ fi - # Find the compiler(s) ac_ext=${ac_fc_srcext-f} ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' diff --git a/src/amuse_evtwin/support/configure.ac b/src/amuse_evtwin/support/configure.ac index a992e54fc3..ee8aeca3b8 100644 --- a/src/amuse_evtwin/support/configure.ac +++ b/src/amuse_evtwin/support/configure.ac @@ -3,10 +3,11 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-evtwin], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() - # Find the compiler(s) AC_PROG_FC() AX_FC_ISO_C_BINDING() diff --git a/src/amuse_fastkick/support/aclocal.m4 b/src/amuse_fastkick/support/aclocal.m4 index d034c07f77..55c307bd5e 100644 --- a/src/amuse_fastkick/support/aclocal.m4 +++ b/src/amuse_fastkick/support/aclocal.m4 @@ -13,6 +13,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_cuda.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_fastkick/support/configure.ac b/src/amuse_fastkick/support/configure.ac index f8e7f9dc45..8ca66b2f52 100644 --- a/src/amuse_fastkick/support/configure.ac +++ b/src/amuse_fastkick/support/configure.ac @@ -1,6 +1,8 @@ AC_CONFIG_AUX_DIR([shared]) AC_CONFIG_MACRO_DIRS([shared/m4]) +AMUSE_LOG_ENVVARS() + AC_INIT([amuse-fastkick], [1.0]) # Pick up Conda env or virtualenv diff --git a/src/amuse_fi/support/aclocal.m4 b/src/amuse_fi/support/aclocal.m4 index 329eb0f3fe..8774720bbb 100644 --- a/src/amuse_fi/support/aclocal.m4 +++ b/src/amuse_fi/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_fi/support/configure b/src/amuse_fi/support/configure index bb423017ee..a2a65e94b6 100755 --- a/src/amuse_fi/support/configure +++ b/src/amuse_fi/support/configure @@ -2480,6 +2480,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_fi/support/configure.ac b/src/amuse_fi/support/configure.ac index ac21b776f7..70b15bc8a6 100644 --- a/src/amuse_fi/support/configure.ac +++ b/src/amuse_fi/support/configure.ac @@ -3,6 +3,7 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-fi], [1.0]) +AMUSE_LOG_ENVVARS() # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_fractalcluster/support/aclocal.m4 b/src/amuse_fractalcluster/support/aclocal.m4 index a0863e8de2..5bff04a8b4 100644 --- a/src/amuse_fractalcluster/support/aclocal.m4 +++ b/src/amuse_fractalcluster/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_mpi.m4]) m4_include([shared/m4/fortran.m4]) diff --git a/src/amuse_fractalcluster/support/configure b/src/amuse_fractalcluster/support/configure index e84e3b5650..bc84d316f6 100755 --- a/src/amuse_fractalcluster/support/configure +++ b/src/amuse_fractalcluster/support/configure @@ -2372,6 +2372,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_fractalcluster/support/configure.ac b/src/amuse_fractalcluster/support/configure.ac index ce116c9117..b84a5b4d73 100644 --- a/src/amuse_fractalcluster/support/configure.ac +++ b/src/amuse_fractalcluster/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-fractalcluster], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_gadget2/support/aclocal.m4 b/src/amuse_gadget2/support/aclocal.m4 index b8249c1acd..40a7aa6d63 100644 --- a/src/amuse_gadget2/support/aclocal.m4 +++ b/src/amuse_gadget2/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_gadget2/support/configure b/src/amuse_gadget2/support/configure index 7eb93c3c4f..c801926fd9 100755 --- a/src/amuse_gadget2/support/configure +++ b/src/amuse_gadget2/support/configure @@ -2813,6 +2813,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_gadget2/support/configure.ac b/src/amuse_gadget2/support/configure.ac index a7d5dcc9e5..6a34ecc1df 100644 --- a/src/amuse_gadget2/support/configure.ac +++ b/src/amuse_gadget2/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-gadget2], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_galactics/support/aclocal.m4 b/src/amuse_galactics/support/aclocal.m4 index b071a48c99..4fca25c545 100644 --- a/src/amuse_galactics/support/aclocal.m4 +++ b/src/amuse_galactics/support/aclocal.m4 @@ -12,6 +12,7 @@ # PARTICULAR PURPOSE. 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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/fortran.m4]) diff --git a/src/amuse_galactics/support/configure b/src/amuse_galactics/support/configure index e4ae2661b4..3c199583bc 100755 --- a/src/amuse_galactics/support/configure +++ b/src/amuse_galactics/support/configure @@ -2295,6 +2295,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_galactics/support/configure.ac b/src/amuse_galactics/support/configure.ac index 7d7adfbb5c..48796a94d4 100644 --- a/src/amuse_galactics/support/configure.ac +++ b/src/amuse_galactics/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-galactics], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_galaxia/support/aclocal.m4 b/src/amuse_galaxia/support/aclocal.m4 index 77af8846d8..1d896bf442 100644 --- a/src/amuse_galaxia/support/aclocal.m4 +++ b/src/amuse_galaxia/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_blas.m4]) m4_include([shared/m4/ax_lapack.m4]) diff --git a/src/amuse_galaxia/support/configure b/src/amuse_galaxia/support/configure index 584a9a6f60..7be618ae7e 100755 --- a/src/amuse_galaxia/support/configure +++ b/src/amuse_galaxia/support/configure @@ -2490,6 +2490,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_galaxia/support/configure.ac b/src/amuse_galaxia/support/configure.ac index 9f1d82ee23..1bbed625b8 100644 --- a/src/amuse_galaxia/support/configure.ac +++ b/src/amuse_galaxia/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-galaxia], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_halogen/support/aclocal.m4 b/src/amuse_halogen/support/aclocal.m4 index e4cc83766d..fcef394b95 100644 --- a/src/amuse_halogen/support/aclocal.m4 +++ b/src/amuse_halogen/support/aclocal.m4 @@ -12,6 +12,7 @@ # PARTICULAR PURPOSE. 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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_halogen/support/configure b/src/amuse_halogen/support/configure index ae85b9cde1..7e99d6d4b5 100755 --- a/src/amuse_halogen/support/configure +++ b/src/amuse_halogen/support/configure @@ -2694,6 +2694,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_halogen/support/configure.ac b/src/amuse_halogen/support/configure.ac index 6208f2d81b..68eec5334c 100644 --- a/src/amuse_halogen/support/configure.ac +++ b/src/amuse_halogen/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-halogen], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_hermite/support/aclocal.m4 b/src/amuse_hermite/support/aclocal.m4 index 019884c26e..29556809c5 100644 --- a/src/amuse_hermite/support/aclocal.m4 +++ b/src/amuse_hermite/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_mpi.m4]) m4_include([shared/m4/pkg.m4]) diff --git a/src/amuse_hermite/support/configure b/src/amuse_hermite/support/configure index 0892ae17c7..20048ec5e3 100755 --- a/src/amuse_hermite/support/configure +++ b/src/amuse_hermite/support/configure @@ -2542,6 +2542,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_hermite/support/configure.ac b/src/amuse_hermite/support/configure.ac index 45716c3c87..d2f4855a48 100644 --- a/src/amuse_hermite/support/configure.ac +++ b/src/amuse_hermite/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-hermite], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_hermite_grx/support/aclocal.m4 b/src/amuse_hermite_grx/support/aclocal.m4 index db9a4969a6..b2a6e2681b 100644 --- a/src/amuse_hermite_grx/support/aclocal.m4 +++ b/src/amuse_hermite_grx/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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_hermite_grx/support/configure b/src/amuse_hermite_grx/support/configure index b31e94327f..b13ec0a623 100755 --- a/src/amuse_hermite_grx/support/configure +++ b/src/amuse_hermite_grx/support/configure @@ -2659,6 +2659,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_hermite_grx/support/configure.ac b/src/amuse_hermite_grx/support/configure.ac index b77221fbed..fcdba486ad 100644 --- a/src/amuse_hermite_grx/support/configure.ac +++ b/src/amuse_hermite_grx/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-hermite_grx], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_higpus/support/aclocal.m4 b/src/amuse_higpus/support/aclocal.m4 index d034c07f77..55c307bd5e 100644 --- a/src/amuse_higpus/support/aclocal.m4 +++ b/src/amuse_higpus/support/aclocal.m4 @@ -13,6 +13,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_cuda.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_higpus/support/configure b/src/amuse_higpus/support/configure index 6975a7d8b7..d597570192 100755 --- a/src/amuse_higpus/support/configure +++ b/src/amuse_higpus/support/configure @@ -2648,6 +2648,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_higpus/support/configure.ac b/src/amuse_higpus/support/configure.ac index f25ad5da6c..4692742383 100644 --- a/src/amuse_higpus/support/configure.ac +++ b/src/amuse_higpus/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-higpus-cuda], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_hop/support/aclocal.m4 b/src/amuse_hop/support/aclocal.m4 index 5fea1010bd..61fa60233e 100644 --- a/src/amuse_hop/support/aclocal.m4 +++ b/src/amuse_hop/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_hop/support/configure b/src/amuse_hop/support/configure index 845674773e..dd87e14623 100755 --- a/src/amuse_hop/support/configure +++ b/src/amuse_hop/support/configure @@ -2723,6 +2723,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_hop/support/configure.ac b/src/amuse_hop/support/configure.ac index 29989d23af..ec45cc2ca2 100644 --- a/src/amuse_hop/support/configure.ac +++ b/src/amuse_hop/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-hop], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_huayno/support/aclocal.m4 b/src/amuse_huayno/support/aclocal.m4 index 749df6c00d..066fba4488 100644 --- a/src/amuse_huayno/support/aclocal.m4 +++ b/src/amuse_huayno/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_opencl.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) diff --git a/src/amuse_huayno/support/configure b/src/amuse_huayno/support/configure index 4a351f8f19..cbea7864c3 100755 --- a/src/amuse_huayno/support/configure +++ b/src/amuse_huayno/support/configure @@ -2726,6 +2726,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_huayno/support/configure.ac b/src/amuse_huayno/support/configure.ac index 35b79826dc..921a9bf5c7 100644 --- a/src/amuse_huayno/support/configure.ac +++ b/src/amuse_huayno/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-huayno], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_kepler/support/aclocal.m4 b/src/amuse_kepler/support/aclocal.m4 index e4cc83766d..fcef394b95 100644 --- a/src/amuse_kepler/support/aclocal.m4 +++ b/src/amuse_kepler/support/aclocal.m4 @@ -12,6 +12,7 @@ # PARTICULAR PURPOSE. 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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_kepler/support/configure b/src/amuse_kepler/support/configure index ed866935c5..f7534ebfa0 100755 --- a/src/amuse_kepler/support/configure +++ b/src/amuse_kepler/support/configure @@ -2226,6 +2226,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_kepler/support/configure.ac b/src/amuse_kepler/support/configure.ac index 2aedf24f9f..2b82129681 100644 --- a/src/amuse_kepler/support/configure.ac +++ b/src/amuse_kepler/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-kepler], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_kepler_orbiters/support/aclocal.m4 b/src/amuse_kepler_orbiters/support/aclocal.m4 index 5fea1010bd..61fa60233e 100644 --- a/src/amuse_kepler_orbiters/support/aclocal.m4 +++ b/src/amuse_kepler_orbiters/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_kepler_orbiters/support/configure.ac b/src/amuse_kepler_orbiters/support/configure.ac index e4a6b46fa0..cc44a317e6 100644 --- a/src/amuse_kepler_orbiters/support/configure.ac +++ b/src/amuse_kepler_orbiters/support/configure.ac @@ -1,6 +1,8 @@ AC_CONFIG_AUX_DIR([shared]) AC_CONFIG_MACRO_DIRS([shared/m4]) +AMUSE_LOG_ENVVARS() + AC_INIT([amuse-kepler_orbiters], [1.0]) # Pick up Conda env or virtualenv diff --git a/src/amuse_krome/support/aclocal.m4 b/src/amuse_krome/support/aclocal.m4 index a08907b9b2..46e7172c16 100644 --- a/src/amuse_krome/support/aclocal.m4 +++ b/src/amuse_krome/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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_krome/support/configure b/src/amuse_krome/support/configure index b6136d2b9d..a1ff90741a 100755 --- a/src/amuse_krome/support/configure +++ b/src/amuse_krome/support/configure @@ -2377,6 +2377,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_krome/support/configure.ac b/src/amuse_krome/support/configure.ac index 1da9ed6b34..fe6c4ac13f 100644 --- a/src/amuse_krome/support/configure.ac +++ b/src/amuse_krome/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-krome], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_mameclot/support/aclocal.m4 b/src/amuse_mameclot/support/aclocal.m4 index d034c07f77..55c307bd5e 100644 --- a/src/amuse_mameclot/support/aclocal.m4 +++ b/src/amuse_mameclot/support/aclocal.m4 @@ -13,6 +13,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_cuda.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_mameclot/support/configure b/src/amuse_mameclot/support/configure index a0bdbac73c..16ca7b437a 100755 --- a/src/amuse_mameclot/support/configure +++ b/src/amuse_mameclot/support/configure @@ -2329,6 +2329,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_mameclot/support/configure.ac b/src/amuse_mameclot/support/configure.ac index e614c68ad6..27ed650366 100644 --- a/src/amuse_mameclot/support/configure.ac +++ b/src/amuse_mameclot/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-mameclot], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_mercury/support/aclocal.m4 b/src/amuse_mercury/support/aclocal.m4 index 8161803730..ee7ad4436c 100644 --- a/src/amuse_mercury/support/aclocal.m4 +++ b/src/amuse_mercury/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_mercury/support/configure b/src/amuse_mercury/support/configure index cc00f55ddd..378ee3e2c0 100755 --- a/src/amuse_mercury/support/configure +++ b/src/amuse_mercury/support/configure @@ -2384,6 +2384,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_mercury/support/configure.ac b/src/amuse_mercury/support/configure.ac index 3401ed3265..cc2e8e7192 100644 --- a/src/amuse_mercury/support/configure.ac +++ b/src/amuse_mercury/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-mercury], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_mesa_r15140/support/aclocal.m4 b/src/amuse_mesa_r15140/support/aclocal.m4 index c4ea1a8e59..d04ff68451 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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_blas.m4]) m4_include([shared/m4/ax_count_cpus.m4]) diff --git a/src/amuse_mesa_r15140/support/configure b/src/amuse_mesa_r15140/support/configure index 1b6ad9e999..2fad7dc4f8 100755 --- a/src/amuse_mesa_r15140/support/configure +++ b/src/amuse_mesa_r15140/support/configure @@ -3029,6 +3029,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_mesa_r15140/support/configure.ac b/src/amuse_mesa_r15140/support/configure.ac index 936a5451cd..593b4e00c4 100644 --- a/src/amuse_mesa_r15140/support/configure.ac +++ b/src/amuse_mesa_r15140/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-mesa_r15140], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_mesa_r2208/support/aclocal.m4 b/src/amuse_mesa_r2208/support/aclocal.m4 index a08907b9b2..46e7172c16 100644 --- a/src/amuse_mesa_r2208/support/aclocal.m4 +++ b/src/amuse_mesa_r2208/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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_mesa_r2208/support/configure b/src/amuse_mesa_r2208/support/configure index 266453d310..2eb56f010c 100755 --- a/src/amuse_mesa_r2208/support/configure +++ b/src/amuse_mesa_r2208/support/configure @@ -2386,6 +2386,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_mesa_r2208/support/configure.ac b/src/amuse_mesa_r2208/support/configure.ac index 97aa7aa97f..9503e59f4e 100644 --- a/src/amuse_mesa_r2208/support/configure.ac +++ b/src/amuse_mesa_r2208/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-mesa_r2208], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_mi6/support/aclocal.m4 b/src/amuse_mi6/support/aclocal.m4 index 5fea1010bd..61fa60233e 100644 --- a/src/amuse_mi6/support/aclocal.m4 +++ b/src/amuse_mi6/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_mi6/support/configure b/src/amuse_mi6/support/configure index 7b56255fdf..efe7121fdc 100755 --- a/src/amuse_mi6/support/configure +++ b/src/amuse_mi6/support/configure @@ -2663,6 +2663,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_mi6/support/configure.ac b/src/amuse_mi6/support/configure.ac index 548a138d57..403668288d 100644 --- a/src/amuse_mi6/support/configure.ac +++ b/src/amuse_mi6/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-mi6], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_mikkola/support/aclocal.m4 b/src/amuse_mikkola/support/aclocal.m4 index 5fea1010bd..61fa60233e 100644 --- a/src/amuse_mikkola/support/aclocal.m4 +++ b/src/amuse_mikkola/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_mikkola/support/configure b/src/amuse_mikkola/support/configure index 7f8700ff09..70d27d7ed2 100755 --- a/src/amuse_mikkola/support/configure +++ b/src/amuse_mikkola/support/configure @@ -2384,6 +2384,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_mikkola/support/configure.ac b/src/amuse_mikkola/support/configure.ac index cec7dd85d1..869f1e3ada 100644 --- a/src/amuse_mikkola/support/configure.ac +++ b/src/amuse_mikkola/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-mikkola], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_mmams/support/aclocal.m4 b/src/amuse_mmams/support/aclocal.m4 index b8249c1acd..40a7aa6d63 100644 --- a/src/amuse_mmams/support/aclocal.m4 +++ b/src/amuse_mmams/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_mmams/support/configure b/src/amuse_mmams/support/configure index cd9140d3b3..162bb3fd8c 100755 --- a/src/amuse_mmams/support/configure +++ b/src/amuse_mmams/support/configure @@ -2804,6 +2804,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_mmams/support/configure.ac b/src/amuse_mmams/support/configure.ac index ca96ec3f45..e162f64536 100644 --- a/src/amuse_mmams/support/configure.ac +++ b/src/amuse_mmams/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-mmams], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_mobse/support/aclocal.m4 b/src/amuse_mobse/support/aclocal.m4 index 8161803730..ee7ad4436c 100644 --- a/src/amuse_mobse/support/aclocal.m4 +++ b/src/amuse_mobse/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_mobse/support/configure b/src/amuse_mobse/support/configure index 678e310049..b97dea2080 100755 --- a/src/amuse_mobse/support/configure +++ b/src/amuse_mobse/support/configure @@ -2368,6 +2368,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x @@ -5746,3 +5759,4 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + diff --git a/src/amuse_mobse/support/configure.ac b/src/amuse_mobse/support/configure.ac index e44471d17f..6b51ae6074 100644 --- a/src/amuse_mobse/support/configure.ac +++ b/src/amuse_mobse/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-sse], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() @@ -27,4 +29,4 @@ AC_LANG_POP([Fortran]) # Generate output AC_CONFIG_FILES([config.mk]) -AC_OUTPUT \ No newline at end of file +AC_OUTPUT diff --git a/src/amuse_mocassin/support/aclocal.m4 b/src/amuse_mocassin/support/aclocal.m4 index a08907b9b2..46e7172c16 100644 --- a/src/amuse_mocassin/support/aclocal.m4 +++ b/src/amuse_mocassin/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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_mocassin/support/configure b/src/amuse_mocassin/support/configure index 51159c7736..aa0839f13b 100755 --- a/src/amuse_mocassin/support/configure +++ b/src/amuse_mocassin/support/configure @@ -2379,6 +2379,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_mocassin/support/configure.ac b/src/amuse_mocassin/support/configure.ac index 1588aeab5e..a6f6abaff6 100644 --- a/src/amuse_mocassin/support/configure.ac +++ b/src/amuse_mocassin/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-mocassin], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_mosse/support/aclocal.m4 b/src/amuse_mosse/support/aclocal.m4 index 8161803730..ee7ad4436c 100644 --- a/src/amuse_mosse/support/aclocal.m4 +++ b/src/amuse_mosse/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_mosse/support/configure b/src/amuse_mosse/support/configure index a1f586a9f8..bc237737de 100755 --- a/src/amuse_mosse/support/configure +++ b/src/amuse_mosse/support/configure @@ -2368,6 +2368,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x @@ -5746,3 +5759,4 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + diff --git a/src/amuse_mosse/support/configure.ac b/src/amuse_mosse/support/configure.ac index 1d852ebf05..51821d07da 100644 --- a/src/amuse_mosse/support/configure.ac +++ b/src/amuse_mosse/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-mosse], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() @@ -27,4 +29,4 @@ AC_LANG_POP([Fortran]) # Generate output AC_CONFIG_FILES([config.mk]) -AC_OUTPUT \ No newline at end of file +AC_OUTPUT diff --git a/src/amuse_mpiamrvac/support/aclocal.m4 b/src/amuse_mpiamrvac/support/aclocal.m4 index a08907b9b2..46e7172c16 100644 --- a/src/amuse_mpiamrvac/support/aclocal.m4 +++ b/src/amuse_mpiamrvac/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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_mpiamrvac/support/configure.ac b/src/amuse_mpiamrvac/support/configure.ac index f3cb8c0fcc..f1ff35b647 100644 --- a/src/amuse_mpiamrvac/support/configure.ac +++ b/src/amuse_mpiamrvac/support/configure.ac @@ -1,6 +1,8 @@ AC_CONFIG_AUX_DIR([shared]) AC_CONFIG_MACRO_DIRS([shared/m4]) +AMUSE_LOG_ENVVARS() + AC_INIT([amuse-mpiamrvac], [1.0]) # Pick up Conda env or virtualenv diff --git a/src/amuse_nbody6xx/support/aclocal.m4 b/src/amuse_nbody6xx/support/aclocal.m4 index 8161803730..ee7ad4436c 100644 --- a/src/amuse_nbody6xx/support/aclocal.m4 +++ b/src/amuse_nbody6xx/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_nbody6xx/support/configure b/src/amuse_nbody6xx/support/configure index f03034d2da..3662630719 100755 --- a/src/amuse_nbody6xx/support/configure +++ b/src/amuse_nbody6xx/support/configure @@ -2375,6 +2375,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_nbody6xx/support/configure.ac b/src/amuse_nbody6xx/support/configure.ac index 733acc231c..a31aa5dc63 100644 --- a/src/amuse_nbody6xx/support/configure.ac +++ b/src/amuse_nbody6xx/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-nbody6xx], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_petar/support/aclocal.m4 b/src/amuse_petar/support/aclocal.m4 index db9a4969a6..b2a6e2681b 100644 --- a/src/amuse_petar/support/aclocal.m4 +++ b/src/amuse_petar/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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_petar/support/configure.ac b/src/amuse_petar/support/configure.ac index 81af284219..3b3c0d34c6 100644 --- a/src/amuse_petar/support/configure.ac +++ b/src/amuse_petar/support/configure.ac @@ -1,6 +1,8 @@ AC_CONFIG_AUX_DIR([shared]) AC_CONFIG_MACRO_DIRS([shared/m4]) +AMUSE_LOG_ENVVARS() + AC_INIT([amuse-petar], [1.0]) # Pick up Conda env or virtualenv diff --git a/src/amuse_ph4/support/aclocal.m4 b/src/amuse_ph4/support/aclocal.m4 index 5fea1010bd..61fa60233e 100644 --- a/src/amuse_ph4/support/aclocal.m4 +++ b/src/amuse_ph4/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_ph4/support/configure b/src/amuse_ph4/support/configure index 016ef37ace..b10d737db2 100755 --- a/src/amuse_ph4/support/configure +++ b/src/amuse_ph4/support/configure @@ -2730,6 +2730,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_ph4/support/configure.ac b/src/amuse_ph4/support/configure.ac index 942b9e54f7..ca168c5052 100644 --- a/src/amuse_ph4/support/configure.ac +++ b/src/amuse_ph4/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-ph4], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_phantom/support/aclocal.m4 b/src/amuse_phantom/support/aclocal.m4 index a08907b9b2..46e7172c16 100644 --- a/src/amuse_phantom/support/aclocal.m4 +++ b/src/amuse_phantom/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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_phantom/support/configure b/src/amuse_phantom/support/configure index 7bc2ffc328..0a60d165b4 100755 --- a/src/amuse_phantom/support/configure +++ b/src/amuse_phantom/support/configure @@ -2395,6 +2395,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_phantom/support/configure.ac b/src/amuse_phantom/support/configure.ac index 4c350c70ff..6f26c63aa8 100644 --- a/src/amuse_phantom/support/configure.ac +++ b/src/amuse_phantom/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-phantom], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_phigrape/support/aclocal.m4 b/src/amuse_phigrape/support/aclocal.m4 index 8161803730..ee7ad4436c 100644 --- a/src/amuse_phigrape/support/aclocal.m4 +++ b/src/amuse_phigrape/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_phigrape/support/configure.ac b/src/amuse_phigrape/support/configure.ac index d94a905e5b..0970262b98 100644 --- a/src/amuse_phigrape/support/configure.ac +++ b/src/amuse_phigrape/support/configure.ac @@ -1,6 +1,8 @@ AC_CONFIG_AUX_DIR([shared]) AC_CONFIG_MACRO_DIRS([shared/m4]) +AMUSE_LOG_ENVVARS() + AC_INIT([amuse-phigrape], [1.0]) # Pick up Conda env or virtualenv diff --git a/src/amuse_rebound/support/aclocal.m4 b/src/amuse_rebound/support/aclocal.m4 index db9a4969a6..b2a6e2681b 100644 --- a/src/amuse_rebound/support/aclocal.m4 +++ b/src/amuse_rebound/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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_rebound/support/configure b/src/amuse_rebound/support/configure index e75b85a9c0..618f6901f5 100755 --- a/src/amuse_rebound/support/configure +++ b/src/amuse_rebound/support/configure @@ -2734,6 +2734,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_rebound/support/configure.ac b/src/amuse_rebound/support/configure.ac index 4b113b9da6..cb113b9bd3 100644 --- a/src/amuse_rebound/support/configure.ac +++ b/src/amuse_rebound/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-rebound], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_sakura/support/aclocal.m4 b/src/amuse_sakura/support/aclocal.m4 index 5fea1010bd..61fa60233e 100644 --- a/src/amuse_sakura/support/aclocal.m4 +++ b/src/amuse_sakura/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_sakura/support/configure.ac b/src/amuse_sakura/support/configure.ac index cee2c181e5..a30fe2ae40 100644 --- a/src/amuse_sakura/support/configure.ac +++ b/src/amuse_sakura/support/configure.ac @@ -1,6 +1,8 @@ AC_CONFIG_AUX_DIR([shared]) AC_CONFIG_MACRO_DIRS([shared/m4]) +AMUSE_LOG_ENVVARS() + AC_INIT([amuse-sakura], [1.0]) # Pick up Conda env or virtualenv diff --git a/src/amuse_seba/support/aclocal.m4 b/src/amuse_seba/support/aclocal.m4 index db9a4969a6..b2a6e2681b 100644 --- a/src/amuse_seba/support/aclocal.m4 +++ b/src/amuse_seba/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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_seba/support/configure b/src/amuse_seba/support/configure index b460ecd5cb..24fdce582e 100755 --- a/src/amuse_seba/support/configure +++ b/src/amuse_seba/support/configure @@ -2665,6 +2665,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_seba/support/configure.ac b/src/amuse_seba/support/configure.ac index 8e03e16f89..cb10eee7a4 100644 --- a/src/amuse_seba/support/configure.ac +++ b/src/amuse_seba/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-seba], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_secularmultiple/support/aclocal.m4 b/src/amuse_secularmultiple/support/aclocal.m4 index e4cc83766d..fcef394b95 100644 --- a/src/amuse_secularmultiple/support/aclocal.m4 +++ b/src/amuse_secularmultiple/support/aclocal.m4 @@ -12,6 +12,7 @@ # PARTICULAR PURPOSE. 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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_secularmultiple/support/configure b/src/amuse_secularmultiple/support/configure index ba5c7e45ce..f500748d46 100755 --- a/src/amuse_secularmultiple/support/configure +++ b/src/amuse_secularmultiple/support/configure @@ -2702,6 +2702,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_secularmultiple/support/configure.ac b/src/amuse_secularmultiple/support/configure.ac index a41e228f8a..537b2b327d 100644 --- a/src/amuse_secularmultiple/support/configure.ac +++ b/src/amuse_secularmultiple/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-secularmultiple], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_sei/support/aclocal.m4 b/src/amuse_sei/support/aclocal.m4 index e4cc83766d..fcef394b95 100644 --- a/src/amuse_sei/support/aclocal.m4 +++ b/src/amuse_sei/support/aclocal.m4 @@ -12,6 +12,7 @@ # PARTICULAR PURPOSE. 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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_sei/support/configure b/src/amuse_sei/support/configure index 2c73021180..6c224ac140 100755 --- a/src/amuse_sei/support/configure +++ b/src/amuse_sei/support/configure @@ -2701,6 +2701,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_sei/support/configure.ac b/src/amuse_sei/support/configure.ac index fc2366fb59..9edef0a48c 100644 --- a/src/amuse_sei/support/configure.ac +++ b/src/amuse_sei/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-sei], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_simplex/support/aclocal.m4 b/src/amuse_simplex/support/aclocal.m4 index 382c743096..cc85f80f84 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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_lib_hdf5.m4]) diff --git a/src/amuse_simplex/support/configure b/src/amuse_simplex/support/configure index 55a19d3b9a..b11cb128bf 100755 --- a/src/amuse_simplex/support/configure +++ b/src/amuse_simplex/support/configure @@ -2861,6 +2861,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_simplex/support/configure.ac b/src/amuse_simplex/support/configure.ac index 1360887d62..c8523c8401 100644 --- a/src/amuse_simplex/support/configure.ac +++ b/src/amuse_simplex/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-simplex], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_smalln/support/aclocal.m4 b/src/amuse_smalln/support/aclocal.m4 index 5fea1010bd..61fa60233e 100644 --- a/src/amuse_smalln/support/aclocal.m4 +++ b/src/amuse_smalln/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_smalln/support/configure b/src/amuse_smalln/support/configure index f14345b3fc..f736ac81e4 100755 --- a/src/amuse_smalln/support/configure +++ b/src/amuse_smalln/support/configure @@ -2721,6 +2721,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_smalln/support/configure.ac b/src/amuse_smalln/support/configure.ac index 894a739569..5b0a1fe932 100644 --- a/src/amuse_smalln/support/configure.ac +++ b/src/amuse_smalln/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-smalln], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_sphray/support/aclocal.m4 b/src/amuse_sphray/support/aclocal.m4 index 8161803730..ee7ad4436c 100644 --- a/src/amuse_sphray/support/aclocal.m4 +++ b/src/amuse_sphray/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_sphray/support/configure b/src/amuse_sphray/support/configure index 76f8953d91..221b51b560 100755 --- a/src/amuse_sphray/support/configure +++ b/src/amuse_sphray/support/configure @@ -2375,6 +2375,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_sphray/support/configure.ac b/src/amuse_sphray/support/configure.ac index 37b13048ca..fc23d17b39 100644 --- a/src/amuse_sphray/support/configure.ac +++ b/src/amuse_sphray/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-sphray], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_sse/support/aclocal.m4 b/src/amuse_sse/support/aclocal.m4 index 8161803730..ee7ad4436c 100644 --- a/src/amuse_sse/support/aclocal.m4 +++ b/src/amuse_sse/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_sse/support/configure b/src/amuse_sse/support/configure index 3538fd4fd0..b97dea2080 100755 --- a/src/amuse_sse/support/configure +++ b/src/amuse_sse/support/configure @@ -2368,6 +2368,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_sse/support/configure.ac b/src/amuse_sse/support/configure.ac index 43795ca058..6b51ae6074 100644 --- a/src/amuse_sse/support/configure.ac +++ b/src/amuse_sse/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-sse], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_symple/support/aclocal.m4 b/src/amuse_symple/support/aclocal.m4 index 019884c26e..29556809c5 100644 --- a/src/amuse_symple/support/aclocal.m4 +++ b/src/amuse_symple/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_mpi.m4]) m4_include([shared/m4/pkg.m4]) diff --git a/src/amuse_symple/support/configure b/src/amuse_symple/support/configure index 7e83107bb9..8f18500d10 100755 --- a/src/amuse_symple/support/configure +++ b/src/amuse_symple/support/configure @@ -2726,6 +2726,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_symple/support/configure.ac b/src/amuse_symple/support/configure.ac index 0226ea229e..fff4b99656 100644 --- a/src/amuse_symple/support/configure.ac +++ b/src/amuse_symple/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-symple], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_tupan/support/aclocal.m4 b/src/amuse_tupan/support/aclocal.m4 index 8c960dbda5..9a65f7607f 100644 --- a/src/amuse_tupan/support/aclocal.m4 +++ b/src/amuse_tupan/support/aclocal.m4 @@ -13,5 +13,6 @@ 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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) diff --git a/src/amuse_tupan/support/configure.ac b/src/amuse_tupan/support/configure.ac index 7a6dced08c..f24b956f24 100644 --- a/src/amuse_tupan/support/configure.ac +++ b/src/amuse_tupan/support/configure.ac @@ -1,6 +1,8 @@ AC_CONFIG_AUX_DIR([shared]) AC_CONFIG_MACRO_DIRS([shared/m4]) +AMUSE_LOG_ENVVARS() + AC_INIT([amuse-tupan], [1.0]) # Pick up Conda env or virtualenv diff --git a/src/amuse_twobody/support/aclocal.m4 b/src/amuse_twobody/support/aclocal.m4 index 0bf833aa86..48edc90f44 100644 --- a/src/amuse_twobody/support/aclocal.m4 +++ b/src/amuse_twobody/support/aclocal.m4 @@ -12,4 +12,5 @@ # PARTICULAR PURPOSE. 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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) diff --git a/src/amuse_twobody/support/configure b/src/amuse_twobody/support/configure index ba3f16dee7..edd0fb0392 100755 --- a/src/amuse_twobody/support/configure +++ b/src/amuse_twobody/support/configure @@ -1717,6 +1717,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_twobody/support/configure.ac b/src/amuse_twobody/support/configure.ac index ff02b20019..06fc4335c4 100644 --- a/src/amuse_twobody/support/configure.ac +++ b/src/amuse_twobody/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-twobody], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/amuse_vader/support/aclocal.m4 b/src/amuse_vader/support/aclocal.m4 index 0435394a98..d17bdac3eb 100644 --- a/src/amuse_vader/support/aclocal.m4 +++ b/src/amuse_vader/support/aclocal.m4 @@ -13,6 +13,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_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_count_cpus.m4]) m4_include([shared/m4/ax_mpi.m4]) diff --git a/src/amuse_vader/support/configure b/src/amuse_vader/support/configure index 91106acc0b..ab809eec48 100755 --- a/src/amuse_vader/support/configure +++ b/src/amuse_vader/support/configure @@ -2797,6 +2797,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # Pick up Conda env or virtualenv if test "x$VIRTUAL_ENV" != x diff --git a/src/amuse_vader/support/configure.ac b/src/amuse_vader/support/configure.ac index 5022da2855..48d3a7f401 100644 --- a/src/amuse_vader/support/configure.ac +++ b/src/amuse_vader/support/configure.ac @@ -3,6 +3,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-vader], [1.0]) +AMUSE_LOG_ENVVARS() + # Pick up Conda env or virtualenv AMUSE_VENV() diff --git a/src/tests/support/aclocal.m4 b/src/tests/support/aclocal.m4 index 019884c26e..29556809c5 100644 --- a/src/tests/support/aclocal.m4 +++ b/src/tests/support/aclocal.m4 @@ -13,6 +13,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.m4]) +m4_include([shared/m4/amuse_log_envvars.m4]) m4_include([shared/m4/amuse_venv.m4]) m4_include([shared/m4/ax_mpi.m4]) m4_include([shared/m4/pkg.m4]) diff --git a/src/tests/support/configure b/src/tests/support/configure index e0be1ca398..711ca74707 100755 --- a/src/tests/support/configure +++ b/src/tests/support/configure @@ -2718,6 +2718,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + + if test "x$VIRTUAL_ENV" != x then : diff --git a/src/tests/support/configure.ac b/src/tests/support/configure.ac index aef70e295e..b271e90069 100644 --- a/src/tests/support/configure.ac +++ b/src/tests/support/configure.ac @@ -1,6 +1,8 @@ AC_CONFIG_MACRO_DIRS([shared/m4]) AC_INIT([amuse-tests], [1.0]) +AMUSE_LOG_ENVVARS() + AMUSE_VENV() AC_PROG_CC() diff --git a/support/aclocal.m4 b/support/aclocal.m4 index 9ac4fdd4ae..d16661c0cb 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_log_envvars.m4]) m4_include([shared/m4/amuse_opencl.m4]) m4_include([shared/m4/ax_blas.m4]) m4_include([shared/m4/ax_check_gnu_make.m4]) diff --git a/support/configure b/support/configure index 1bfc0a3723..6ac2648360 100755 --- a/support/configure +++ b/support/configure @@ -3087,6 +3087,19 @@ test -n "$target_alias" && NONENONEs,x,x, && program_prefix=${target_alias}- + + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + printf "%s\n" "=== Shell environment ===" + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + printf "%s\n" "${amuse_le_var}=${amuse_le_val}" + done + printf "%s\n" "=== End shell environment ===" + + # If we have a Conda environment active, then we're going to do everything via Conda, # including the dependencies. So in this case, we'll detect installed Conda packages, # rather than searching the system for libraries in the usual way. diff --git a/support/configure.ac b/support/configure.ac index bad6700de5..485dddfba1 100644 --- a/support/configure.ac +++ b/support/configure.ac @@ -4,6 +4,8 @@ AC_INIT([amuse], [1.0]) AC_CANONICAL_TARGET +AMUSE_LOG_ENVVARS() + # If we have a Conda environment active, then we're going to do everything via Conda, # including the dependencies. So in this case, we'll detect installed Conda packages, # rather than searching the system for libraries in the usual way. diff --git a/support/shared/m4/amuse_log_envvars.m4 b/support/shared/m4/amuse_log_envvars.m4 new file mode 100644 index 0000000000..d6b9228c75 --- /dev/null +++ b/support/shared/m4/amuse_log_envvars.m4 @@ -0,0 +1,17 @@ +# Macro for logging important environment variables + +# AMUSE_LOG_ENVVARS() +# +AC_DEFUN([AMUSE_LOG_ENVVARS], [ + amuse_le_vars="SHELL CC CXX FC F77 MPICC MPICXX MPIFC CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OMPI_CC OMPI_CXX OMPI_FC OMPI_CPPFLAGS OMPI_LDFLAGS OMPI_LIBS" + + AS_ECHO(["=== Shell environment ==="]) + + for amuse_le_var in ${amuse_le_vars} + do + eval "amuse_le_val=\${$amuse_le_var}" + AS_ECHO(["${amuse_le_var}=${amuse_le_val}"]) + done + AS_ECHO(["=== End shell environment ==="]) +]) +