3 files changed, 21 insertions, 8 deletions
diff --git a/config/companion_tools/automake.in b/config/companion_tools/automake.in
index 500ae14..781a44a 100644
--- a/config/companion_tools/automake.in
+++ b/config/companion_tools/automake.in
@@ -14,15 +14,18 @@ config AUTOMAKE_V_1_15
 
 config AUTOMAKE_V_1_14
     bool
-    prompt "1.14"
+    prompt "1.14 (OBSOLETE)"
+    depends on OBSOLETE
 
 config AUTOMAKE_V_1_11_6
     bool
-    prompt "1.11.6"
+    prompt "1.11.6 (OBSOLETE)"
+    depends on OBSOLETE
 
 config AUTOMAKE_V_1_11_1
     bool
-    prompt "1.11.1"
+    prompt "1.11.1 (OBSOLETE)"
+    depends on OBSOLETE
 
 endchoice
 
diff --git a/config/companion_tools/m4.in b/config/companion_tools/m4.in
index b99a466..a09e9fa 100644
--- a/config/companion_tools/m4.in
+++ b/config/companion_tools/m4.in
@@ -8,13 +8,19 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config M4_V_1_4_18
+    bool
+    prompt "1.4.18"
+
 config M4_V_1_4_17
     bool
-    prompt "1.4.17"
+    prompt "1.4.17 (OBSOLETE)"
+    depends on OBSOLETE
 
 config M4_V_1_4_13
     bool
-    prompt "1.4.13"
+    prompt "1.4.13 (OBSOLETE)"
+    depends on OBSOLETE
 
 endchoice
 
@@ -22,5 +28,6 @@ config M4_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "1.4.18" if M4_V_1_4_18
     default "1.4.17" if M4_V_1_4_17
     default "1.4.13" if M4_V_1_4_13
diff --git a/config/companion_tools/make.in b/config/companion_tools/make.in
index 0935cd8..e9e7997 100644
--- a/config/companion_tools/make.in
+++ b/config/companion_tools/make.in
@@ -14,15 +14,18 @@ config MAKE_V_4_2_1
 
 config MAKE_V_4_1
     bool
-    prompt "4.1"
+    prompt "4.1 (OBSOLETE)"
+    depends on OBSOLETE
 
 config MAKE_V_4_0
     bool
-    prompt "4.0"
+    prompt "4.0 (OBSOLETE)"
+    depends on OBSOLETE
 
 config MAKE_V_3_81
     bool
-    prompt "3.81"
+    prompt "3.81 (OBSOLETE)"
+    depends on OBSOLETE
 
 endchoice