5 files changed, 72 insertions, 11 deletions
diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in
index dcac30d..d6e129d 100644
--- a/config/companion_libs/cloog.in
+++ b/config/companion_libs/cloog.in
@@ -1,31 +1,32 @@
 # CLooG options
 
+# CLooG 0.18.4 requires ISL 0.12 or newer
+# CLooG 0.18.1/0.18.0 frequires ISL 0.12 or older
 choice
     bool
     prompt "CLooG version"
 
-if ISL
-
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
 config CLOOG_V_0_18_4
     bool
     prompt "0.18.4"
+    depends on ISL_V_0_12_or_later
     select CLOOG_0_18_4_or_later
 
 config CLOOG_V_0_18_1
     bool
     prompt "0.18.1"
+    depends on !ISL_V_0_14_or_later
     select CLOOG_0_18_or_later
 
 config CLOOG_V_0_18_0
     bool
     prompt "0.18.0"
+    depends on !ISL_V_0_14_or_later
     select CLOOG_0_18_or_later
 
-endif # ISL
-
 endchoice
 
 config CLOOG_VERSION
diff --git a/config/companion_libs/expat.in b/config/companion_libs/expat.in
index 1dff4a7..3f2ebd2 100644
--- a/config/companion_libs/expat.in
+++ b/config/companion_libs/expat.in
@@ -6,9 +6,13 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
-config EXPAT_V_2_1_0
+config EXPAT_V_2_2_0
     bool
-    prompt "2.1.0"
+    prompt "2.2.0"
+
+config EXPAT_V_2_1_1
+    bool
+    prompt "2.1.1"
 
 endchoice
 
@@ -16,4 +20,5 @@ config EXPAT_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
-    default "2.1.0" if EXPAT_V_2_1_0
+    default "2.2.0" if EXPAT_V_2_2_0
+    default "2.1.1" if EXPAT_V_2_1_1
diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in
index 52ffcdf..b92050d 100644
--- a/config/companion_libs/gmp.in
+++ b/config/companion_libs/gmp.in
@@ -6,6 +6,11 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config GMP_V_6_1_2
+    bool
+    prompt "6.1.2"
+    select GMP_5_0_2_or_later
+
 config GMP_V_6_1_0
     bool
     prompt "6.1.0"
@@ -57,6 +62,7 @@ config GMP_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "6.1.2" if GMP_V_6_1_2
     default "6.1.0" if GMP_V_6_1_0
     default "6.0.0a" if GMP_V_6_0_0
     default "5.1.3" if GMP_V_5_1_3
diff --git a/config/companion_libs/isl.in b/config/companion_libs/isl.in
index 1477212..f1af3a0 100644
--- a/config/companion_libs/isl.in
+++ b/config/companion_libs/isl.in
@@ -1,31 +1,71 @@
 # ISL options
 
+# GCC 4.8 supports ISL 0.10 to 0.14
+# GCC 4.9 supports ISL 0.10 to 0.15
+# GCC 5   supports ISL 0.12 to 0.16
+# GCC 6   supports ISL 0.14 to 0.16
+# Starting with GCC 5, GCC's configure no longer checks the ISL version explicitly,
+# despite what the configure's message says ("checking for isl 0.15 or 0.16").
+# Instead, it verifies that certain interfaces are available, so it accepts 0.17.1
+# or 0.18 under that check. Include them as experimental just in case anyone needs
+# the bugfixes in these releases.
 choice
     bool
     prompt "ISL version"
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config ISL_V_0_18
+    bool
+    prompt "0.18"
+    depends on EXPERIMENTAL # Not officially recommended by GCC
+    depends on CC_GCC_5_or_later
+    select ISL_V_0_16_or_later
+
+config ISL_V_0_17_1
+    bool
+    prompt "0.17.1"
+    depends on EXPERIMENTAL # Not officially recommended by GCC
+    depends on CC_GCC_5_or_later
+    select ISL_V_0_16_or_later
+
+config ISL_V_0_16_1
+    bool
+    prompt "0.16.1"
+    depends on CC_GCC_5_or_later
+    select ISL_V_0_16_or_later
+
+config ISL_V_0_15
+    bool
+    prompt "0.15"
+    select ISL_V_0_15_or_later
+
 config ISL_V_0_14
     bool
     prompt "0.14"
-    depends on CLOOG_0_18_4_or_later || CC_GCC_5_or_later
     select ISL_V_0_14_or_later
 
 config ISL_V_0_12_2
     bool
     prompt "0.12.2"
-    depends on ! CLOOG_0_18_4_or_later || CC_GCC_5_or_later
+    depends on !CC_GCC_6_or_later
     select ISL_V_0_12_or_later
 
 config ISL_V_0_11_1
     bool
     prompt "0.11.1"
-    depends on ! CLOOG_0_18_4_or_later
-    depends on ! CC_GCC_5_or_later
+    depends on !CC_GCC_4_9_or_later
 
 endchoice
 
+config ISL_V_0_16_or_later
+    bool
+    select ISL_V_0_15_or_later
+
+config ISL_V_0_15_or_later
+    bool
+    select ISL_V_0_14_or_later
+
 config ISL_V_0_14_or_later
     bool
     select ISL_V_0_12_or_later
@@ -37,6 +77,10 @@ config ISL_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "0.18" if ISL_V_0_18
+    default "0.17.1" if ISL_V_0_17_1
+    default "0.16.1" if ISL_V_0_16_1
+    default "0.15" if ISL_V_0_15
     default "0.14" if ISL_V_0_14
     default "0.12.2" if ISL_V_0_12_2
     default "0.11.1" if ISL_V_0_11_1
diff --git a/config/companion_libs/mpfr.in b/config/companion_libs/mpfr.in
index fef50b0..5957e23 100644
--- a/config/companion_libs/mpfr.in
+++ b/config/companion_libs/mpfr.in
@@ -6,6 +6,10 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config MPFR_V_3_1_5
+    bool
+    prompt "3.1.5"
+
 config MPFR_V_3_1_3
     bool
     prompt "3.1.3"
@@ -44,6 +48,7 @@ config MPFR_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "3.1.5" if MPFR_V_3_1_5
     default "3.1.3" if MPFR_V_3_1_3
     default "3.1.2" if MPFR_V_3_1_2
     default "3.1.0" if MPFR_V_3_1_0