diff -r 3e2f2100a76d -r 3709e61ad85b config/companion_libs/cloog.in
--- a/config/companion_libs/cloog.in	Wed May 02 21:09:29 2012 +0200
+++ b/config/companion_libs/cloog.in	Sun May 05 00:01:05 2013 +0200
@@ -2,10 +2,22 @@
 
 choice
     bool
-    prompt "CLooG/ppl version"
+    prompt "CLooG version"
+
+if ISL
+
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config CLOOG_V_0_18_0
+    bool
+    prompt "0.18.0"
+    select CLOOG_0_18_or_later
+
+endif # ISL
+
+if PPL
+
 config CLOOG_V_0_15_11
     bool
     prompt "0.15.11"
@@ -32,12 +44,15 @@
     bool
     prompt "0.15.6"
 
+endif # PPL
+
 endchoice
 
 config CLOOG_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "0.18.0" if CLOOG_V_0_18_0
     default "0.15.11" if CLOOG_V_0_15_11
     default "0.15.10" if CLOOG_V_0_15_10
     default "0.15.9" if CLOOG_V_0_15_9
@@ -45,6 +60,9 @@
     default "0.15.7" if CLOOG_V_0_15_7
     default "0.15.6" if CLOOG_V_0_15_6
 
+config CLOOG_0_18_or_later
+    bool
+
 config CLOOG_0_15_1x
     bool
     select CLOOG_NEEDS_AUTORECONF