diff --git a/lib/sapporo_light/support/configure b/lib/sapporo_light/support/configure
index c3a511a1fe..4255f8d649 100755
--- a/lib/sapporo_light/support/configure
+++ b/lib/sapporo_light/support/configure
@@ -3934,11 +3934,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3980,11 +3980,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_aarsethzare/support/configure b/src/amuse_aarsethzare/support/configure
index f4328a5464..661080fd8e 100755
--- a/src/amuse_aarsethzare/support/configure
+++ b/src/amuse_aarsethzare/support/configure
@@ -2400,7 +2400,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_adaptb/support/configure b/src/amuse_adaptb/support/configure
index 570734a5ca..296aecbe62 100755
--- a/src/amuse_adaptb/support/configure
+++ b/src/amuse_adaptb/support/configure
@@ -2771,7 +2771,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3637,11 +3636,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3683,11 +3682,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_athena/support/configure b/src/amuse_athena/support/configure
index 27d1489866..b8ddfa4830 100755
--- a/src/amuse_athena/support/configure
+++ b/src/amuse_athena/support/configure
@@ -674,7 +674,6 @@ GUNZIP
 TAR
 DOWNLOAD
 CURL
-WGET
 RANLIB
 AR
 target_os
@@ -2842,7 +2841,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4420,108 +4418,6 @@ fi
 
 # Find tools to download and unpack with
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$WGET"; then
-  ac_cv_prog_WGET="$WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WGET="${ac_tool_prefix}wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WGET=$ac_cv_prog_WGET
-if test -n "$WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-printf "%s\n" "$WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WGET"; then
-  ac_ct_WGET=$WGET
-  # Extract the first word of "wget", so it can be a program name with args.
-set dummy wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_WGET"; then
-  ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WGET="wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
-if test -n "$ac_ct_WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
-printf "%s\n" "$ac_ct_WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_WGET" = x; then
-    WGET=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WGET=$ac_ct_WGET
-  fi
-else
-  WGET="$ac_cv_prog_WGET"
-fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
 set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -4625,24 +4521,16 @@ else
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
-printf %s "checking for a wget or curl to download files with... " >&6; }
-    if test "x$WGET" != "x"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
+printf %s "checking for a tool to download files with... " >&6; }
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-        fi
     fi
 
 
@@ -6315,11 +6203,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6361,11 +6249,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_bhtree/support/configure b/src/amuse_bhtree/support/configure
index e710c1cd04..b9e12f1942 100755
--- a/src/amuse_bhtree/support/configure
+++ b/src/amuse_bhtree/support/configure
@@ -2749,7 +2749,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4357,11 +4356,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4403,11 +4402,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_brutus/support/configure b/src/amuse_brutus/support/configure
index 43e0789ab7..edb4392b35 100755
--- a/src/amuse_brutus/support/configure
+++ b/src/amuse_brutus/support/configure
@@ -2871,7 +2871,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4477,11 +4476,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4523,11 +4522,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_bse/support/configure b/src/amuse_bse/support/configure
index ce6a11a1cd..7042de5b02 100755
--- a/src/amuse_bse/support/configure
+++ b/src/amuse_bse/support/configure
@@ -2387,7 +2387,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_capreole/support/configure b/src/amuse_capreole/support/configure
index bc147a4f0d..ef62d38f1d 100755
--- a/src/amuse_capreole/support/configure
+++ b/src/amuse_capreole/support/configure
@@ -2403,7 +2403,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_etics/support/configure b/src/amuse_etics/support/configure
index 8e16c753d6..bc2e2d2fb7 100755
--- a/src/amuse_etics/support/configure
+++ b/src/amuse_etics/support/configure
@@ -2752,7 +2752,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3618,11 +3617,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3664,11 +3663,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_evtwin/support/configure b/src/amuse_evtwin/support/configure
index d620b5df1b..794e6c92dc 100755
--- a/src/amuse_evtwin/support/configure
+++ b/src/amuse_evtwin/support/configure
@@ -2390,7 +2390,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_fastkick/support/configure b/src/amuse_fastkick/support/configure
index cb3f6b9edc..dfae0d530b 100755
--- a/src/amuse_fastkick/support/configure
+++ b/src/amuse_fastkick/support/configure
@@ -2651,7 +2651,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3517,11 +3516,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3563,11 +3562,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_fi/support/configure b/src/amuse_fi/support/configure
index deb9e5259c..bb423017ee 100755
--- a/src/amuse_fi/support/configure
+++ b/src/amuse_fi/support/configure
@@ -2499,7 +2499,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_fractalcluster/support/configure b/src/amuse_fractalcluster/support/configure
index 8ab757ef4e..e84e3b5650 100755
--- a/src/amuse_fractalcluster/support/configure
+++ b/src/amuse_fractalcluster/support/configure
@@ -2391,7 +2391,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_gadget2/support/configure b/src/amuse_gadget2/support/configure
index ac7851b3ee..7eb93c3c4f 100755
--- a/src/amuse_gadget2/support/configure
+++ b/src/amuse_gadget2/support/configure
@@ -2832,7 +2832,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4438,11 +4437,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4484,11 +4483,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_galactics/support/configure b/src/amuse_galactics/support/configure
index c739b03986..e4ae2661b4 100755
--- a/src/amuse_galactics/support/configure
+++ b/src/amuse_galactics/support/configure
@@ -2314,7 +2314,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_galaxia/support/configure b/src/amuse_galaxia/support/configure
index 807a83c621..584a9a6f60 100755
--- a/src/amuse_galaxia/support/configure
+++ b/src/amuse_galaxia/support/configure
@@ -2509,7 +2509,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_halogen/support/configure b/src/amuse_halogen/support/configure
index 5da27097b3..ae85b9cde1 100755
--- a/src/amuse_halogen/support/configure
+++ b/src/amuse_halogen/support/configure
@@ -2713,7 +2713,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4319,11 +4318,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4365,11 +4364,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_hermite/support/configure b/src/amuse_hermite/support/configure
index 86d7b5d986..0892ae17c7 100755
--- a/src/amuse_hermite/support/configure
+++ b/src/amuse_hermite/support/configure
@@ -2561,7 +2561,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3108,11 +3107,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3154,11 +3153,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_hermite_grx/support/configure b/src/amuse_hermite_grx/support/configure
index 1df350d85e..b31e94327f 100755
--- a/src/amuse_hermite_grx/support/configure
+++ b/src/amuse_hermite_grx/support/configure
@@ -632,7 +632,6 @@ GUNZIP
 TAR
 DOWNLOAD
 CURL
-WGET
 RANLIB
 AR
 target_os
@@ -2679,7 +2678,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3545,11 +3543,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3591,11 +3589,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3892,108 +3890,6 @@ fi
 
 # Find tools to download and unpack with
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$WGET"; then
-  ac_cv_prog_WGET="$WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WGET="${ac_tool_prefix}wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WGET=$ac_cv_prog_WGET
-if test -n "$WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-printf "%s\n" "$WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WGET"; then
-  ac_ct_WGET=$WGET
-  # Extract the first word of "wget", so it can be a program name with args.
-set dummy wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_WGET"; then
-  ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WGET="wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
-if test -n "$ac_ct_WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
-printf "%s\n" "$ac_ct_WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_WGET" = x; then
-    WGET=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WGET=$ac_ct_WGET
-  fi
-else
-  WGET="$ac_cv_prog_WGET"
-fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
 set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -4097,24 +3993,16 @@ else
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
-printf %s "checking for a wget or curl to download files with... " >&6; }
-    if test "x$WGET" != "x"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
+printf %s "checking for a tool to download files with... " >&6; }
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-        fi
     fi
 
 
diff --git a/src/amuse_higpus/support/configure b/src/amuse_higpus/support/configure
index 233671abe2..6975a7d8b7 100755
--- a/src/amuse_higpus/support/configure
+++ b/src/amuse_higpus/support/configure
@@ -2667,7 +2667,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3533,11 +3532,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3579,11 +3578,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_hop/support/configure b/src/amuse_hop/support/configure
index bc78559128..845674773e 100755
--- a/src/amuse_hop/support/configure
+++ b/src/amuse_hop/support/configure
@@ -2742,7 +2742,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4348,11 +4347,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4394,11 +4393,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_huayno/support/configure b/src/amuse_huayno/support/configure
index 149f872a13..4a351f8f19 100755
--- a/src/amuse_huayno/support/configure
+++ b/src/amuse_huayno/support/configure
@@ -2745,7 +2745,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4351,11 +4350,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4397,11 +4396,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_kepler/support/configure b/src/amuse_kepler/support/configure
index 1d6d80087d..ed866935c5 100755
--- a/src/amuse_kepler/support/configure
+++ b/src/amuse_kepler/support/configure
@@ -2245,7 +2245,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3111,11 +3110,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3157,11 +3156,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_kepler_orbiters/support/configure b/src/amuse_kepler_orbiters/support/configure
index 0a015145b3..fa050643e0 100755
--- a/src/amuse_kepler_orbiters/support/configure
+++ b/src/amuse_kepler_orbiters/support/configure
@@ -2667,7 +2667,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3533,11 +3532,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3579,11 +3578,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_krome/support/configure b/src/amuse_krome/support/configure
index a623465422..b6136d2b9d 100755
--- a/src/amuse_krome/support/configure
+++ b/src/amuse_krome/support/configure
@@ -631,7 +631,6 @@ CFLAGS
 CC
 DOWNLOAD
 CURL
-WGET
 RANLIB
 AR
 target_os
@@ -2397,7 +2396,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3487,108 +3485,6 @@ fi
 
 # Find something to download things with
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$WGET"; then
-  ac_cv_prog_WGET="$WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WGET="${ac_tool_prefix}wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WGET=$ac_cv_prog_WGET
-if test -n "$WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-printf "%s\n" "$WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WGET"; then
-  ac_ct_WGET=$WGET
-  # Extract the first word of "wget", so it can be a program name with args.
-set dummy wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_WGET"; then
-  ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WGET="wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
-if test -n "$ac_ct_WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
-printf "%s\n" "$ac_ct_WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_WGET" = x; then
-    WGET=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WGET=$ac_ct_WGET
-  fi
-else
-  WGET="$ac_cv_prog_WGET"
-fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
 set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -3692,24 +3588,16 @@ else
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
-printf %s "checking for a wget or curl to download files with... " >&6; }
-    if test "x$WGET" != "x"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
+printf %s "checking for a tool to download files with... " >&6; }
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-        fi
     fi
 
 
diff --git a/src/amuse_mameclot/support/configure b/src/amuse_mameclot/support/configure
index b142840e21..a0bdbac73c 100755
--- a/src/amuse_mameclot/support/configure
+++ b/src/amuse_mameclot/support/configure
@@ -2348,7 +2348,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_mercury/support/configure b/src/amuse_mercury/support/configure
index 89714cdb6b..cc00f55ddd 100755
--- a/src/amuse_mercury/support/configure
+++ b/src/amuse_mercury/support/configure
@@ -2403,7 +2403,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_mesa_r15140/Makefile b/src/amuse_mesa_r15140/Makefile
index 451cdb2f64..30bd7dbac7 100644
--- a/src/amuse_mesa_r15140/Makefile
+++ b/src/amuse_mesa_r15140/Makefile
@@ -29,7 +29,7 @@ src/fpx3.tar.gz: | src
 	$(DOWNLOAD) http://user.astro.wisc.edu/~townsend/resource/download/sdk2/src/fpx3.tar.gz >$@
 
 src/fpx3_deps: | src
-	$(DOWNLOAD) https://raw.githubusercontent.com/rhdtownsend/sdk2/master/profile/common/fpx3/fpx3_deps >$@
+	$(DOWNLOAD) https://raw.githubusercontent.com/rhdtownsend/sdk2/897655920d1375d63df9e21b58485d6d3d62b342/package/fpx3/files/fpx3_deps >$@
 
 src/mesa-$(MESA_VERSION).zip:
 	$(DOWNLOAD) https://zenodo.org/record/4311514/files/mesa-$(MESA_VERSION).zip >$@
@@ -205,7 +205,7 @@ install_disabled:
 	@echo
 	@echo 'Please use'
 	@echo
-	@echo '    ./setup develop amuse-mesa_r15140'
+	@echo '    ./setup develop amuse-mesa-r15140'
 	@echo
 	@echo 'to install it'
 	@echo
diff --git a/src/amuse_mesa_r15140/packages/amuse-mesa-r15140.amuse_deps b/src/amuse_mesa_r15140/packages/amuse-mesa-r15140.amuse_deps
index 6b28883910..ad14dc143f 100644
--- a/src/amuse_mesa_r15140/packages/amuse-mesa-r15140.amuse_deps
+++ b/src/amuse_mesa_r15140/packages/amuse-mesa-r15140.amuse_deps
@@ -1 +1 @@
-c c++ fortran python bison cmake install download patch mpi openmp hdf5
+c c++ fortran python bison cmake install download patch mpi openmp hdf5 lapack blas perl tar gunzip unzip unxz
diff --git a/src/amuse_mesa_r15140/support/configure b/src/amuse_mesa_r15140/support/configure
index 448ec21bae..1b6ad9e999 100755
--- a/src/amuse_mesa_r15140/support/configure
+++ b/src/amuse_mesa_r15140/support/configure
@@ -687,7 +687,6 @@ PKG_CONFIG_PATH
 PKG_CONFIG
 DOWNLOAD
 CURL
-WGET
 RANLIB
 AR
 target_os
@@ -3049,7 +3048,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4656,11 +4654,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4702,11 +4700,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5324,108 +5322,6 @@ fi
 
 # Find something to download things with
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$WGET"; then
-  ac_cv_prog_WGET="$WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WGET="${ac_tool_prefix}wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WGET=$ac_cv_prog_WGET
-if test -n "$WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-printf "%s\n" "$WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WGET"; then
-  ac_ct_WGET=$WGET
-  # Extract the first word of "wget", so it can be a program name with args.
-set dummy wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_WGET"; then
-  ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WGET="wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
-if test -n "$ac_ct_WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
-printf "%s\n" "$ac_ct_WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_WGET" = x; then
-    WGET=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WGET=$ac_ct_WGET
-  fi
-else
-  WGET="$ac_cv_prog_WGET"
-fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
 set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -5529,24 +5425,16 @@ else
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
-printf %s "checking for a wget or curl to download files with... " >&6; }
-    if test "x$WGET" != "x"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
+printf %s "checking for a tool to download files with... " >&6; }
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-        fi
     fi
 
 
diff --git a/src/amuse_mesa_r2208/support/configure b/src/amuse_mesa_r2208/support/configure
index 26d5079c23..266453d310 100755
--- a/src/amuse_mesa_r2208/support/configure
+++ b/src/amuse_mesa_r2208/support/configure
@@ -632,7 +632,6 @@ CFLAGS
 CC
 DOWNLOAD
 CURL
-WGET
 RANLIB
 AR
 target_os
@@ -2406,7 +2405,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3496,108 +3494,6 @@ fi
 
 # Find something to download things with
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$WGET"; then
-  ac_cv_prog_WGET="$WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WGET="${ac_tool_prefix}wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WGET=$ac_cv_prog_WGET
-if test -n "$WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-printf "%s\n" "$WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WGET"; then
-  ac_ct_WGET=$WGET
-  # Extract the first word of "wget", so it can be a program name with args.
-set dummy wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_WGET"; then
-  ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WGET="wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
-if test -n "$ac_ct_WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
-printf "%s\n" "$ac_ct_WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_WGET" = x; then
-    WGET=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WGET=$ac_ct_WGET
-  fi
-else
-  WGET="$ac_cv_prog_WGET"
-fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
 set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -3701,24 +3597,16 @@ else
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
-printf %s "checking for a wget or curl to download files with... " >&6; }
-    if test "x$WGET" != "x"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
+printf %s "checking for a tool to download files with... " >&6; }
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-        fi
     fi
 
 
diff --git a/src/amuse_mi6/support/configure b/src/amuse_mi6/support/configure
index 7cc26c0429..7b56255fdf 100755
--- a/src/amuse_mi6/support/configure
+++ b/src/amuse_mi6/support/configure
@@ -2682,7 +2682,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3548,11 +3547,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3594,11 +3593,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_mikkola/support/configure b/src/amuse_mikkola/support/configure
index 9eb2ca0d14..7f8700ff09 100755
--- a/src/amuse_mikkola/support/configure
+++ b/src/amuse_mikkola/support/configure
@@ -2403,7 +2403,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_mmams/support/configure b/src/amuse_mmams/support/configure
index 3c92964dc3..cd9140d3b3 100755
--- a/src/amuse_mmams/support/configure
+++ b/src/amuse_mmams/support/configure
@@ -2823,7 +2823,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4429,11 +4428,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4475,11 +4474,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_mobse/support/configure b/src/amuse_mobse/support/configure
index fb4cc59c3c..678e310049 100755
--- a/src/amuse_mobse/support/configure
+++ b/src/amuse_mobse/support/configure
@@ -2387,7 +2387,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_mocassin/support/configure b/src/amuse_mocassin/support/configure
index 41d6124bb2..51159c7736 100755
--- a/src/amuse_mocassin/support/configure
+++ b/src/amuse_mocassin/support/configure
@@ -633,7 +633,6 @@ GUNZIP
 TAR
 DOWNLOAD
 CURL
-WGET
 RANLIB
 AR
 target_os
@@ -2399,7 +2398,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3490,108 +3488,6 @@ fi
 
 # Find tools to download and unpack with
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$WGET"; then
-  ac_cv_prog_WGET="$WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WGET="${ac_tool_prefix}wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WGET=$ac_cv_prog_WGET
-if test -n "$WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-printf "%s\n" "$WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WGET"; then
-  ac_ct_WGET=$WGET
-  # Extract the first word of "wget", so it can be a program name with args.
-set dummy wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_WGET"; then
-  ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WGET="wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
-if test -n "$ac_ct_WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
-printf "%s\n" "$ac_ct_WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_WGET" = x; then
-    WGET=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WGET=$ac_ct_WGET
-  fi
-else
-  WGET="$ac_cv_prog_WGET"
-fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
 set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -3695,24 +3591,16 @@ else
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
-printf %s "checking for a wget or curl to download files with... " >&6; }
-    if test "x$WGET" != "x"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
+printf %s "checking for a tool to download files with... " >&6; }
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-        fi
     fi
 
 
diff --git a/src/amuse_mosse/support/configure b/src/amuse_mosse/support/configure
index a4df43824b..a1f586a9f8 100755
--- a/src/amuse_mosse/support/configure
+++ b/src/amuse_mosse/support/configure
@@ -2387,7 +2387,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_mpiamrvac/support/configure b/src/amuse_mpiamrvac/support/configure
index 9236d65756..7125bd06aa 100755
--- a/src/amuse_mpiamrvac/support/configure
+++ b/src/amuse_mpiamrvac/support/configure
@@ -634,7 +634,6 @@ CFLAGS
 CC
 DOWNLOAD
 CURL
-WGET
 RANLIB
 AR
 target_os
@@ -2406,7 +2405,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3496,108 +3494,6 @@ fi
 
 # Find something to download things with
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$WGET"; then
-  ac_cv_prog_WGET="$WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WGET="${ac_tool_prefix}wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WGET=$ac_cv_prog_WGET
-if test -n "$WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-printf "%s\n" "$WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WGET"; then
-  ac_ct_WGET=$WGET
-  # Extract the first word of "wget", so it can be a program name with args.
-set dummy wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_WGET"; then
-  ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WGET="wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
-if test -n "$ac_ct_WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
-printf "%s\n" "$ac_ct_WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_WGET" = x; then
-    WGET=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WGET=$ac_ct_WGET
-  fi
-else
-  WGET="$ac_cv_prog_WGET"
-fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
 set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -3701,24 +3597,16 @@ else
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
-printf %s "checking for a wget or curl to download files with... " >&6; }
-    if test "x$WGET" != "x"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
+printf %s "checking for a tool to download files with... " >&6; }
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-        fi
     fi
 
 
diff --git a/src/amuse_nbody6xx/support/configure b/src/amuse_nbody6xx/support/configure
index ef3b8ce846..f03034d2da 100755
--- a/src/amuse_nbody6xx/support/configure
+++ b/src/amuse_nbody6xx/support/configure
@@ -2394,7 +2394,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_petar/support/configure b/src/amuse_petar/support/configure
index fe1914911f..6c5b83f77a 100755
--- a/src/amuse_petar/support/configure
+++ b/src/amuse_petar/support/configure
@@ -634,7 +634,6 @@ CFLAGS
 CC
 DOWNLOAD
 CURL
-WGET
 RANLIB
 AR
 target_os
@@ -2693,7 +2692,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3559,11 +3557,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3605,11 +3603,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3905,108 +3903,6 @@ fi
 
 # Find something to download things with
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$WGET"; then
-  ac_cv_prog_WGET="$WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WGET="${ac_tool_prefix}wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WGET=$ac_cv_prog_WGET
-if test -n "$WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-printf "%s\n" "$WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WGET"; then
-  ac_ct_WGET=$WGET
-  # Extract the first word of "wget", so it can be a program name with args.
-set dummy wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_WGET"; then
-  ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WGET="wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
-if test -n "$ac_ct_WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
-printf "%s\n" "$ac_ct_WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_WGET" = x; then
-    WGET=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WGET=$ac_ct_WGET
-  fi
-else
-  WGET="$ac_cv_prog_WGET"
-fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
 set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -4110,24 +4006,16 @@ else
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
-printf %s "checking for a wget or curl to download files with... " >&6; }
-    if test "x$WGET" != "x"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
+printf %s "checking for a tool to download files with... " >&6; }
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-        fi
     fi
 
 
diff --git a/src/amuse_ph4/support/configure b/src/amuse_ph4/support/configure
index dab6a9186b..016ef37ace 100755
--- a/src/amuse_ph4/support/configure
+++ b/src/amuse_ph4/support/configure
@@ -2749,7 +2749,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4355,11 +4354,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4401,11 +4400,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_phantom/support/configure b/src/amuse_phantom/support/configure
index f4db9e40b8..7bc2ffc328 100755
--- a/src/amuse_phantom/support/configure
+++ b/src/amuse_phantom/support/configure
@@ -636,7 +636,6 @@ CC
 UNZIP
 DOWNLOAD
 CURL
-WGET
 RANLIB
 AR
 target_os
@@ -2415,7 +2414,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3506,108 +3504,6 @@ fi
 
 # Find tools to download and unpack with
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$WGET"; then
-  ac_cv_prog_WGET="$WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WGET="${ac_tool_prefix}wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WGET=$ac_cv_prog_WGET
-if test -n "$WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-printf "%s\n" "$WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WGET"; then
-  ac_ct_WGET=$WGET
-  # Extract the first word of "wget", so it can be a program name with args.
-set dummy wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_WGET"; then
-  ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WGET="wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
-if test -n "$ac_ct_WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
-printf "%s\n" "$ac_ct_WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_WGET" = x; then
-    WGET=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WGET=$ac_ct_WGET
-  fi
-else
-  WGET="$ac_cv_prog_WGET"
-fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
 set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -3711,24 +3607,16 @@ else
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
-printf %s "checking for a wget or curl to download files with... " >&6; }
-    if test "x$WGET" != "x"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
+printf %s "checking for a tool to download files with... " >&6; }
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-        fi
     fi
 
 
diff --git a/src/amuse_phigrape/support/configure b/src/amuse_phigrape/support/configure
index 1bf4811f0c..6c9a7d89a6 100755
--- a/src/amuse_phigrape/support/configure
+++ b/src/amuse_phigrape/support/configure
@@ -2496,7 +2496,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_rebound/support/configure b/src/amuse_rebound/support/configure
index 8bf2d7e49f..e75b85a9c0 100755
--- a/src/amuse_rebound/support/configure
+++ b/src/amuse_rebound/support/configure
@@ -634,7 +634,6 @@ GUNZIP
 TAR
 DOWNLOAD
 CURL
-WGET
 RANLIB
 AR
 target_os
@@ -2754,7 +2753,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4360,11 +4358,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4406,11 +4404,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4707,108 +4705,6 @@ fi
 
 # Find tools to download and unpack with
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$WGET"; then
-  ac_cv_prog_WGET="$WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WGET="${ac_tool_prefix}wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WGET=$ac_cv_prog_WGET
-if test -n "$WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-printf "%s\n" "$WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WGET"; then
-  ac_ct_WGET=$WGET
-  # Extract the first word of "wget", so it can be a program name with args.
-set dummy wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_WGET"; then
-  ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WGET="wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
-if test -n "$ac_ct_WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
-printf "%s\n" "$ac_ct_WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_WGET" = x; then
-    WGET=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WGET=$ac_ct_WGET
-  fi
-else
-  WGET="$ac_cv_prog_WGET"
-fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
 set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -4912,24 +4808,16 @@ else
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
-printf %s "checking for a wget or curl to download files with... " >&6; }
-    if test "x$WGET" != "x"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
+printf %s "checking for a tool to download files with... " >&6; }
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-        fi
     fi
 
 
diff --git a/src/amuse_sakura/support/configure b/src/amuse_sakura/support/configure
index 6ed67a355a..8ed63c3428 100755
--- a/src/amuse_sakura/support/configure
+++ b/src/amuse_sakura/support/configure
@@ -2740,7 +2740,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4346,11 +4345,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4392,11 +4391,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_seba/support/configure b/src/amuse_seba/support/configure
index 7beaa29edf..b460ecd5cb 100755
--- a/src/amuse_seba/support/configure
+++ b/src/amuse_seba/support/configure
@@ -633,7 +633,6 @@ CFLAGS
 CC
 DOWNLOAD
 CURL
-WGET
 RANLIB
 AR
 target_os
@@ -2685,7 +2684,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3551,11 +3549,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3597,11 +3595,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3897,108 +3895,6 @@ fi
 
 # Find something to download things with
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$WGET"; then
-  ac_cv_prog_WGET="$WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WGET="${ac_tool_prefix}wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WGET=$ac_cv_prog_WGET
-if test -n "$WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-printf "%s\n" "$WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WGET"; then
-  ac_ct_WGET=$WGET
-  # Extract the first word of "wget", so it can be a program name with args.
-set dummy wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_WGET"; then
-  ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WGET="wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
-if test -n "$ac_ct_WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
-printf "%s\n" "$ac_ct_WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_WGET" = x; then
-    WGET=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WGET=$ac_ct_WGET
-  fi
-else
-  WGET="$ac_cv_prog_WGET"
-fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
 set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -4102,24 +3998,16 @@ else
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
-printf %s "checking for a wget or curl to download files with... " >&6; }
-    if test "x$WGET" != "x"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
+printf %s "checking for a tool to download files with... " >&6; }
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-        fi
     fi
 
 
diff --git a/src/amuse_secularmultiple/support/configure b/src/amuse_secularmultiple/support/configure
index 77100c96e0..ba5c7e45ce 100755
--- a/src/amuse_secularmultiple/support/configure
+++ b/src/amuse_secularmultiple/support/configure
@@ -2721,7 +2721,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4327,11 +4326,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4373,11 +4372,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_sei/support/configure b/src/amuse_sei/support/configure
index a000899f10..2c73021180 100755
--- a/src/amuse_sei/support/configure
+++ b/src/amuse_sei/support/configure
@@ -2720,7 +2720,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4327,11 +4326,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4373,11 +4372,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_simplex/support/configure b/src/amuse_simplex/support/configure
index 022b4e4c04..55a19d3b9a 100755
--- a/src/amuse_simplex/support/configure
+++ b/src/amuse_simplex/support/configure
@@ -2880,7 +2880,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3746,11 +3745,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -3792,11 +3791,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_smalln/support/configure b/src/amuse_smalln/support/configure
index a218cd114d..f14345b3fc 100755
--- a/src/amuse_smalln/support/configure
+++ b/src/amuse_smalln/support/configure
@@ -2740,7 +2740,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4346,11 +4345,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4392,11 +4391,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_sphray/support/configure b/src/amuse_sphray/support/configure
index 862b3482cd..76f8953d91 100755
--- a/src/amuse_sphray/support/configure
+++ b/src/amuse_sphray/support/configure
@@ -2394,7 +2394,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_sse/support/configure b/src/amuse_sse/support/configure
index 7f2b174b9d..3538fd4fd0 100755
--- a/src/amuse_sse/support/configure
+++ b/src/amuse_sse/support/configure
@@ -2387,7 +2387,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_symple/support/configure b/src/amuse_symple/support/configure
index 3b0156dca0..7e83107bb9 100755
--- a/src/amuse_symple/support/configure
+++ b/src/amuse_symple/support/configure
@@ -2745,7 +2745,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4032,11 +4031,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4078,11 +4077,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/src/amuse_tupan/support/configure b/src/amuse_tupan/support/configure
index b586574be4..ddaa8fbc7e 100755
--- a/src/amuse_tupan/support/configure
+++ b/src/amuse_tupan/support/configure
@@ -619,7 +619,6 @@ BUNZIP2
 TAR
 DOWNLOAD
 CURL
-WGET
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -2226,7 +2225,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3555,108 +3553,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Find tools to download and unpack with
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$WGET"; then
-  ac_cv_prog_WGET="$WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WGET="${ac_tool_prefix}wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WGET=$ac_cv_prog_WGET
-if test -n "$WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-printf "%s\n" "$WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WGET"; then
-  ac_ct_WGET=$WGET
-  # Extract the first word of "wget", so it can be a program name with args.
-set dummy wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_WGET"; then
-  ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WGET="wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
-if test -n "$ac_ct_WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
-printf "%s\n" "$ac_ct_WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_WGET" = x; then
-    WGET=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WGET=$ac_ct_WGET
-  fi
-else
-  WGET="$ac_cv_prog_WGET"
-fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
 set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -3760,24 +3656,16 @@ else
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
-printf %s "checking for a wget or curl to download files with... " >&6; }
-    if test "x$WGET" != "x"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
+printf %s "checking for a tool to download files with... " >&6; }
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-        fi
     fi
 
 
diff --git a/src/amuse_twobody/support/configure b/src/amuse_twobody/support/configure
index 681254802d..ba3f16dee7 100755
--- a/src/amuse_twobody/support/configure
+++ b/src/amuse_twobody/support/configure
@@ -1736,7 +1736,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
diff --git a/src/amuse_vader/support/configure b/src/amuse_vader/support/configure
index ad354e9aa1..91106acc0b 100755
--- a/src/amuse_vader/support/configure
+++ b/src/amuse_vader/support/configure
@@ -691,7 +691,6 @@ MPI_CFLAGS
 MPICC
 DOWNLOAD
 CURL
-WGET
 RANLIB
 AR
 target_os
@@ -2817,7 +2816,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4424,11 +4422,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4470,11 +4468,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4771,108 +4769,6 @@ fi
 
 # Find something to download things with
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$WGET"; then
-  ac_cv_prog_WGET="$WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WGET="${ac_tool_prefix}wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WGET=$ac_cv_prog_WGET
-if test -n "$WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-printf "%s\n" "$WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WGET"; then
-  ac_ct_WGET=$WGET
-  # Extract the first word of "wget", so it can be a program name with args.
-set dummy wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_WGET"; then
-  ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WGET="wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
-if test -n "$ac_ct_WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
-printf "%s\n" "$ac_ct_WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_WGET" = x; then
-    WGET=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WGET=$ac_ct_WGET
-  fi
-else
-  WGET="$ac_cv_prog_WGET"
-fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
 set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -4976,24 +4872,16 @@ else
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
-printf %s "checking for a wget or curl to download files with... " >&6; }
-    if test "x$WGET" != "x"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
+printf %s "checking for a tool to download files with... " >&6; }
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-        fi
     fi
 
 
diff --git a/src/tests/support/configure b/src/tests/support/configure
index e881ee7b0a..e0be1ca398 100755
--- a/src/tests/support/configure
+++ b/src/tests/support/configure
@@ -2735,7 +2735,6 @@ then :
 
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4022,11 +4021,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4068,11 +4067,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/support/configure b/support/configure
index e7e0114cd1..1bfc0a3723 100755
--- a/support/configure
+++ b/support/configure
@@ -812,7 +812,6 @@ TAR
 PATCH
 DOWNLOAD
 CURL
-WGET
 target_os
 target_vendor
 target_cpu
@@ -3339,108 +3338,6 @@ fi
 
 
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$WGET"; then
-  ac_cv_prog_WGET="$WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WGET="${ac_tool_prefix}wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WGET=$ac_cv_prog_WGET
-if test -n "$WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-printf "%s\n" "$WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WGET"; then
-  ac_ct_WGET=$WGET
-  # Extract the first word of "wget", so it can be a program name with args.
-set dummy wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_WGET"; then
-  ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WGET="wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
-if test -n "$ac_ct_WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
-printf "%s\n" "$ac_ct_WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_WGET" = x; then
-    WGET=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WGET=$ac_ct_WGET
-  fi
-else
-  WGET="$ac_cv_prog_WGET"
-fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
 set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -3544,24 +3441,16 @@ else
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
-printf %s "checking for a wget or curl to download files with... " >&6; }
-    if test "x$WGET" != "x"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
+printf %s "checking for a tool to download files with... " >&6; }
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-        fi
     fi
 
 
@@ -6146,108 +6035,6 @@ fi
 
 
 
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$WGET"; then
-  ac_cv_prog_WGET="$WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WGET="${ac_tool_prefix}wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-WGET=$ac_cv_prog_WGET
-if test -n "$WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-printf "%s\n" "$WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_WGET"; then
-  ac_ct_WGET=$WGET
-  # Extract the first word of "wget", so it can be a program name with args.
-set dummy wget; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_WGET+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_WGET"; then
-  ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WGET="wget"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
-if test -n "$ac_ct_WGET"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
-printf "%s\n" "$ac_ct_WGET" >&6; }
-else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-  if test "x$ac_ct_WGET" = x; then
-    WGET=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    WGET=$ac_ct_WGET
-  fi
-else
-  WGET="$ac_cv_prog_WGET"
-fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
 set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -6351,24 +6138,16 @@ else
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
-printf %s "checking for a wget or curl to download files with... " >&6; }
-    if test "x$WGET" != "x"
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
+printf %s "checking for a tool to download files with... " >&6; }
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-        else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-        fi
     fi
 
 
@@ -15117,11 +14896,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15163,11 +14942,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
diff --git a/support/setup/dependencies.sh b/support/setup/dependencies.sh
index 170ad75490..0dcde64c2c 100644
--- a/support/setup/dependencies.sh
+++ b/support/setup/dependencies.sh
@@ -9,7 +9,7 @@
 # - coreutils
 # - Python 3
 # - PkgConfig
-# - wget or curl
+# - curl
 # - patch
 # - GNU tar
 # - unzip
diff --git a/support/shared/m4/amuse_download.m4 b/support/shared/m4/amuse_download.m4
index 6cd03aee6f..476145a3cb 100644
--- a/support/shared/m4/amuse_download.m4
+++ b/support/shared/m4/amuse_download.m4
@@ -5,32 +5,27 @@
 #
 # AMUSE_DOWNLOAD()
 #
-# Searches for a download tool. Two popular and commonly available command line
-# download tools are curl and wget. This macro tries to find either one of them
-# and sets DOWNLOAD to a command that will take a URL and download its contents to
-# standard output. This makes it easier to write that output to a file with a known
-# name, which you usually want in a Makefile.
+# Searches for a download tool.
+#
+# This macro tries to find a downloader and sets DOWNLOAD to a command that will take a
+# URL and download its contents to standard output. This makes it easier to write that
+# output to a file with a known name, which you usually want in a Makefile.
+#
+# This used to support both wget and curl, but we had problems with wget with BitBucket
+# and a MESA server, so that's been removed and it's curl-only now.
 #
 # To download a file, use $(DOWNLOAD) https://example.com >example.html
 #
 AC_DEFUN([AMUSE_DOWNLOAD], [
-    AC_CHECK_TOOL(WGET, wget)
     AC_CHECK_TOOL(CURL, curl)
 
-    AC_MSG_CHECKING([for a wget or curl to download files with])
-    if test "x$WGET" != "x"
+    AC_MSG_CHECKING([for a tool to download files with])
+    if test "x$CURL" != "x"
     then
-        # The MESA SDK server rejects wget, this is the official work-around
-        DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
+        DOWNLOAD="$CURL -L"
         AC_MSG_RESULT([yes])
     else
-        if test "x$CURL" != "x"
-        then
-            DOWNLOAD="$CURL -L"
-            AC_MSG_RESULT([yes])
-        else
-            AC_MSG_RESULT([no])
-        fi
+        AC_MSG_RESULT([no])
     fi
 
     AC_SUBST([DOWNLOAD])
diff --git a/support/shared/m4/amuse_venv.m4 b/support/shared/m4/amuse_venv.m4
index 155d88d9d6..3d20db4c6b 100644
--- a/support/shared/m4/amuse_venv.m4
+++ b/support/shared/m4/amuse_venv.m4
@@ -19,7 +19,6 @@ AC_DEFUN([AMUSE_VENV], [
     AS_IF([test "x$CONDA_PREFIX" != x], [
         # Conda does not set FCFLAGS, so we copy from FFLAGS here
         FCFLAGS="$FFLAGS"
-        LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
         # Conda pkg-config includes this already, but in case we have one from
         # the system...
         PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"