Switch comp.libs/tools and debug to new framework.

Signed-off-by: Alexey Neyman <stilor@att.net>

5 files changed, 5 insertions, 142 deletions

diff --git a/config/companion_tools/autoconf.in b/config/companion_tools/autoconf.in
index b85e1f9..b49017d 100644
--- a/config/companion_tools/autoconf.in
+++ b/config/companion_tools/autoconf.in
@@ -4,26 +4,4 @@
 ## default y if !CONFIGURE_has_autoreconf_2_63_or_newer
 ## help Autoconf
 
-choice
-    bool
-    prompt "Autoconf version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config AUTOCONF_V_2_69
-    bool
-    prompt "2.69"
-
-config AUTOCONF_V_2_65
-    bool
-    prompt "2.65 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config AUTOCONF_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2.69" if AUTOCONF_V_2_69
-    default "2.65" if AUTOCONF_V_2_65
+source "config/versions/autoconf.in"
diff --git a/config/companion_tools/automake.in b/config/companion_tools/automake.in
index 31d036b..455200e 100644
--- a/config/companion_tools/automake.in
+++ b/config/companion_tools/automake.in
@@ -3,38 +3,4 @@
 ## default y if !CONFIGURE_has_automake_1_15_or_newer
 ## help Automake
 
-choice
-    bool
-    prompt "Automake version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config AUTOMAKE_V_1_15
-    bool
-    prompt "1.15"
-
-config AUTOMAKE_V_1_14
-    bool
-    prompt "1.14 (OBSOLETE)"
-    depends on OBSOLETE
-
-config AUTOMAKE_V_1_11_6
-    bool
-    prompt "1.11.6 (OBSOLETE)"
-    depends on OBSOLETE
-
-config AUTOMAKE_V_1_11_1
-    bool
-    prompt "1.11.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config AUTOMAKE_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "1.15" if AUTOMAKE_V_1_15
-    default "1.14" if AUTOMAKE_V_1_14
-    default "1.11.6" if AUTOMAKE_V_1_11_6
-    default "1.11.1" if AUTOMAKE_V_1_11_1
+source "config/versions/automake.in"
diff --git a/config/companion_tools/libtool.in b/config/companion_tools/libtool.in
index 5c14fa0..071b53e 100644
--- a/config/companion_tools/libtool.in
+++ b/config/companion_tools/libtool.in
@@ -2,22 +2,5 @@
 
 ## default y if !CONFIGURE_has_libtool_2_4_or_newer
 ## default y if !CONFIGURE_has_libtoolize_2_4_or_newer
-## help Libtool
 
-choice
-    bool
-    prompt "Libtool version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBTOOL_V_2_4_6
-    bool
-    prompt "2.4.6"
-
-endchoice
-
-config LIBTOOL_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2.4.6" if LIBTOOL_V_2_4_6
+source "config/versions/libtool.in"
diff --git a/config/companion_tools/m4.in b/config/companion_tools/m4.in
index eb6a3d3..1a81a9f 100644
--- a/config/companion_tools/m4.in
+++ b/config/companion_tools/m4.in
@@ -1,34 +1,5 @@
 # GNU m4
 
 ## default y if !CONFIGURE_has_gnu_m4_1_4_12_or_newer
-## help GNU m4
 
-choice
-    bool
-    prompt "m4 version"
-# 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 (OBSOLETE)"
-    depends on OBSOLETE
-
-config M4_V_1_4_13
-    bool
-    prompt "1.4.13 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-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
+source "config/versions/m4.in"
diff --git a/config/companion_tools/make.in b/config/companion_tools/make.in
index b6834a7..5c9cfb3 100644
--- a/config/companion_tools/make.in
+++ b/config/companion_tools/make.in
@@ -1,45 +1,10 @@
 # GNU make
 
 ## default y if !CONFIGURE_has_make_3_81_or_newer
-## help GNU make
 
-choice
-    bool
-    prompt "make version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config MAKE_V_4_2_1
-    bool
-    prompt "4.2.1"
-
-config MAKE_V_4_1
-    bool
-    prompt "4.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MAKE_V_4_0
-    bool
-    prompt "4.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MAKE_V_3_81
-    bool
-    prompt "3.81 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
+source "config/versions/make.in"
 
 config MAKE_GMAKE_SYMLINK
     bool
     prompt "Add gmake symlink to companion gnu/make"
     depends on COMP_TOOLS_make
-
-config MAKE_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "4.2.1" if MAKE_V_4_2_1
-    default "4.1" if MAKE_V_4_1
-    default "4.0" if MAKE_V_4_0
-    default "3.81" if MAKE_V_3_81