3 files changed, 6 insertions, 4 deletions
diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh
index e6a4875..0fc5875 100644
--- a/scripts/build/companion_libs/100-gmp.sh
+++ b/scripts/build/companion_libs/100-gmp.sh
@@ -84,7 +84,9 @@ do_gmp_backend() {
 
     CT_DoLog EXTRA "Configuring GMP"
 
-    if [ ! "${CT_GMP_5_0_2_or_later}" = "y" ]; then
+    # FIXME is it needed even for older versions? They seem to compile fine
+    # without it.
+    if [ "${CT_GMP_HAS_MPBSD}" = "y" ]; then
         extra_config+=("--enable-mpbsd")
     fi
 
diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh
index ef93bbd..0b8777b 100644
--- a/scripts/build/companion_libs/121-isl.sh
+++ b/scripts/build/companion_libs/121-isl.sh
@@ -86,12 +86,12 @@ do_isl_backend() {
 
     CT_DoLog EXTRA "Configuring ISL"
 
-    if [ "${CT_ISL_V_0_12_or_later}" != "y" ]; then
+    if [ "${CT_ISL_NEEDS_WITH_GMP}" != "y" ]; then
         extra_config+=("--with-libgmp-prefix=${prefix}")
         extra_config+=("--with-libgmpxx-prefix=${prefix}")
     fi
 
-    if [ "${CT_ISL_V_0_14_or_later}" != "y" ]; then
+    if [ "${CT_ISL_HAS_WITH_PIPLIB}" != "y" ]; then
         extra_config+=("--with-piplib=no")
     fi
 
diff --git a/scripts/build/companion_libs/130-cloog.sh b/scripts/build/companion_libs/130-cloog.sh
index b21b028..6090b27 100644
--- a/scripts/build/companion_libs/130-cloog.sh
+++ b/scripts/build/companion_libs/130-cloog.sh
@@ -85,7 +85,7 @@ do_cloog_backend() {
         eval "${arg// /\\ }"
     done
 
-    if [ "${CT_CLOOG_0_18_or_later}" = y ]; then
+    if [ "${CT_CLOOG_HAS_WITH_GMP_ISL_OSL}" = y ]; then
         cloog_opts+=( --with-gmp=system --with-gmp-prefix="${prefix}" )
         cloog_opts+=( --with-isl=system --with-isl-prefix="${prefix}" )
         cloog_opts+=( --without-osl )