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

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

24 files changed, 68 insertions, 1107 deletions

diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index 5e5cc67..089301c 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -5,19 +5,19 @@ comment "GNU binutils"
 source "config/versions/binutils.in"
 
 config BINUTILS_HAS_HASH_STYLE
-    default y if BINUTILS_MS_2_23
+    default y if BINUTILS_2_23_or_later
     bool
 
 config BINUTILS_HAS_GOLD
-    default y if BINUTILS_MS_2_23
+    default y if BINUTILS_2_23_or_later
     bool
 
 config BINUTILS_HAS_PLUGINS
-    default y if BINUTILS_MS_2_23
+    default y if BINUTILS_2_23_or_later
     bool
 
 config BINUTILS_HAS_PKGVERSION_BUGURL
-    default y if BINUTILS_MS_2_23
+    default y if BINUTILS_2_23_or_later
     bool
 
 # gold only suports the listed architectures
diff --git a/config/binutils/binutils.in.2 b/config/binutils/binutils.in.2
index f913355..29ae543 100644
--- a/config/binutils/binutils.in.2
+++ b/config/binutils/binutils.in.2
@@ -9,64 +9,7 @@ config ELF2FLT_REQUIRES
 
 comment "elf2flt"
 
-choice
-    bool
-    prompt "elf2flt version"
-
-config ELF2FLT_GIT
-    bool
-    prompt "git"
-    depends on CONFIGURE_has_git
-    help
-      Grab the latest version of elf2flt from the CVS repository
-
-config ELF2FLT_CUSTOM
-    bool
-    prompt "Custom elf2flt"
-    depends on EXPERIMENTAL || !CONFIGURE_has_git
-    help
-      The choosen elf2flt version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-endchoice
-
-if ELF2FLT_GIT
-
-config ELF2FLT_GIT_CSET
-    string
-    prompt "git cset"
-    default "6d80ab6c93409e796f85da404bde84b841231531"
-    help
-      Enter the git changeset to use.
-
-      The default currently points to the HEAD of the git tree.
-
-endif # ELF2FLT_GIT
-
-config ELF2FLT_VERSION
-    string
-    default ELF2FLT_GIT_CSET if ELF2FLT_GIT
-    default ELF2FLT_CUSTOM_VERSION if ELF2FLT_CUSTOM
-
-if ELF2FLT_CUSTOM
-
-config ELF2FLT_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom elf2flt source"
-    help
-      Enter the path to the directory or tarball of your source for elf2flt.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component, elf2flt, and the version is set
-      below in the custom version string.
-
-config ELF2FLT_CUSTOM_VERSION
-    string
-    prompt "elf2flt custom version number"
-    help
-      Enter the version number for your custom elf2flt.
-
-endif # ELF2FLT_CUSTOM
+source "config/versions/elf2flt.in"
 
 config ELF2FLT_EXTRA_CONFIG_ARRAY
     string
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 427fc97..c0feaef 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -3,7 +3,7 @@
 ## default y
 ## select CC_SUPPORT_CXX if !LIBC_none
 ## select CC_SUPPORT_FORTRAN
-## select CC_SUPPORT_JAVA if !CC_GCC_6_or_later
+## select CC_SUPPORT_JAVA if !GCC_7_or_later
 ## select CC_SUPPORT_ADA
 ## select CC_SUPPORT_OBJC
 ## select CC_SUPPORT_OBJCXX
@@ -32,7 +32,7 @@ config CC_GCC_GOLD
     default y
 
 config CC_GCC_HAS_LIBMPX
-    depends on GCC_MS_5
+    depends on GCC_5_or_later
     bool
 
 config CC_LANG_JAVA_USE_ECJ
diff --git a/config/companion_libs.in b/config/companion_libs.in
index fae49ec..76ab0f9 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -122,43 +122,60 @@ config NCURSES_TARGET
 config ZLIB
     bool "Build local zlib"
 
+# FIXME this needs to have a list of options
+# [ ] libfoo for build
+# [ ] libfoo for host (if canadian)
+# [ ] libfoo for target
+#     libfoo options -->
+#
+# Then have other packages *set default* for build/host
+# (but not select, so that user can utilize build's or host's system library)
+# and *select* the target (so that we build it if we must, and let user optionally
+# build it if he wants). Upon any of these options LIBFOO_{BUILD,HOST,TARGET}
+# being set, set LIBFOO_ENABLED and use that as a qualifier for submenu.
+# For now, just have comments delineating the libs.
 if ZLIB
+comment "zlib options"
 source "config/companion_libs/zlib.in"
 endif
 if LIBICONV
+comment "libiconv options"
 source "config/companion_libs/libiconv.in"
 endif
 if GETTEXT
+comment "gettext options"
 source "config/companion_libs/gettext.in"
 endif
 if GMP
+comment "GMP options"
 source "config/companion_libs/gmp.in"
 endif
 if MPFR
+comment "MPFR options"
 source "config/companion_libs/mpfr.in"
 endif
 if ISL
+comment "ISL options"
 source "config/companion_libs/isl.in"
 endif
 if CLOOG
+comment "CLooG options"
 source "config/companion_libs/cloog.in"
 endif
 if MPC
+comment "MPC options"
 source "config/companion_libs/mpc.in"
 endif
 if LIBELF || LIBELF_TARGET
-comment "libelf version needed to build for target"
-    depends on !LIBELF
+comment "libelf options"
 source "config/companion_libs/libelf.in"
 endif
 if EXPAT || EXPAT_TARGET
-comment "expat version needed to build for target"
-    depends on !EXPAT
+comment "expat options"
 source "config/companion_libs/expat.in"
 endif
 if NCURSES || NCURSES_TARGET
-comment "ncurses version needed to build for target"
-    depends on !NCURSES
+comment "ncurses options"
 source "config/companion_libs/ncurses.in"
 endif
 
diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in
index 95b283c..3c92d52 100644
--- a/config/companion_libs/cloog.in
+++ b/config/companion_libs/cloog.in
@@ -1,51 +1,12 @@
 # CLooG options
 ## depends on OBSOLETE
 
+# TBD: encode these version requirements - how?
 # 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"
 
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
+source "config/versions/cloog.in"
 
-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 (OBSOLETE)"
-    depends on !ISL_V_0_14_or_later
-    depends on OBSOLETE
-    select CLOOG_0_18_or_later
-
-config CLOOG_V_0_18_0
-    bool
-    prompt "0.18.0 (OBSOLETE)"
-    depends on !ISL_V_0_14_or_later
-    depends on OBSOLETE
-    select CLOOG_0_18_or_later
-
-endchoice
-
-config CLOOG_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "0.18.4" if CLOOG_V_0_18_4
-    default "0.18.1" if CLOOG_V_0_18_1
-    default "0.18.0" if CLOOG_V_0_18_0
-
-config CLOOG_0_18_4_or_later
-    bool
-    select CLOOG_0_18_or_later
-
-config CLOOG_0_18_or_later
-    bool
-
-config CLOOG_NEEDS_AUTORECONF
-    bool
+config CLOOG_HAS_WITH_GMP_ISL_OSL
+	bool
+	default y if CLOOG_0_18_or_later
diff --git a/config/companion_libs/expat.in b/config/companion_libs/expat.in
index 4c2f2e2..a2753a4 100644
--- a/config/companion_libs/expat.in
+++ b/config/companion_libs/expat.in
@@ -1,25 +1,3 @@
 # expat config file
 
-choice
-    bool
-    prompt "expat version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config EXPAT_V_2_2_1
-    bool
-    prompt "2.2.1"
-
-config EXPAT_V_2_1_1
-    bool
-    prompt "2.1.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config EXPAT_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2.2.1" if EXPAT_V_2_2_1
-    default "2.1.1" if EXPAT_V_2_1_1
+source "config/versions/expat.in"
diff --git a/config/companion_libs/gettext.in b/config/companion_libs/gettext.in
index d76955a..4928ede 100644
--- a/config/companion_libs/gettext.in
+++ b/config/companion_libs/gettext.in
@@ -1,25 +1,3 @@
 # gettext options
 
-choice
-    bool
-    prompt "gettext version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config GETTEXT_V_0_19_8_1
-    bool
-    prompt "0.19.8.1"
-
-config GETTEXT_V_0_19_7
-    bool
-    prompt "0.19.7 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config GETTEXT_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "0.19.8.1" if GETTEXT_V_0_19_8_1
-    default "0.19.7" if GETTEXT_V_0_19_7
+source "config/versions/gettext.in"
diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in
index 167c772..28359cd 100644
--- a/config/companion_libs/gmp.in
+++ b/config/companion_libs/gmp.in
@@ -1,83 +1,7 @@
 # GMP options
 
-choice
-    bool
-    prompt "GMP version"
-# 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 (OBSOLETE)"
-    select GMP_5_0_2_or_later
-    depends on OBSOLETE
-
-config GMP_V_6_0_0
-    bool
-    prompt "6.0.0a (OBSOLETE)"
-    select GMP_5_0_2_or_later
-    depends on OBSOLETE
-
-config GMP_V_5_1_3
-    bool
-    prompt "5.1.3 (OBSOLETE)"
-    select GMP_5_0_2_or_later
-    depends on OBSOLETE
+source "config/versions/gmp.in"
 
-config GMP_V_5_1_1
+config GMP_HAS_MPBSD
     bool
-    prompt "5.1.1 (OBSOLETE)"
-    select GMP_5_0_2_or_later
-    depends on OBSOLETE
-
-config GMP_V_5_0_2
-    bool
-    prompt "5.0.2 (OBSOLETE)"
-    select GMP_5_0_2_or_later
-    depends on OBSOLETE
-
-config GMP_V_5_0_1
-    bool
-    prompt "5.0.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config GMP_V_4_3_2
-    bool
-    prompt "4.3.2 (OBSOLETE)"
-    depends on OBSOLETE
-
-config GMP_V_4_3_1
-    bool
-    prompt "4.3.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config GMP_V_4_3_0
-    bool
-    prompt "4.3.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-# To disable --enable-mpbsd
-config GMP_5_0_2_or_later
-    bool
-
-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
-    default "5.1.1" if GMP_V_5_1_1
-    default "5.0.2" if GMP_V_5_0_2
-    default "5.0.1" if GMP_V_5_0_1
-    default "4.3.2" if GMP_V_4_3_2
-    default "4.3.1" if GMP_V_4_3_1
-    default "4.3.0" if GMP_V_4_3_0
+    default y if !GMP_5_1_or_later
diff --git a/config/companion_libs/isl.in b/config/companion_libs/isl.in
index bb2766f..cf0fea8 100644
--- a/config/companion_libs/isl.in
+++ b/config/companion_libs/isl.in
@@ -1,92 +1,23 @@
 # ISL options
 
+# TBD need to encode this with new framework
 # 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
+# GCC 7   supports ISL 0.15 and up
 # 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
-
-# Linaro version of 4.9 does not support ISL 0.15, but most recent
-# mainline 4.9 release (4.9.4) does.
-config ISL_V_0_15
-    bool
-    prompt "0.15"
-    depends on CC_GCC_4_9_or_later
-    select ISL_V_0_15_or_later
-
-config ISL_V_0_14
-    bool
-    prompt "0.14 (OBSOLETE)"
-    select ISL_V_0_14_or_later
-    depends on OBSOLETE
-
-config ISL_V_0_12_2
-    bool
-    prompt "0.12.2 (OBSOLETE)"
-    depends on !CC_GCC_6_or_later
-    select ISL_V_0_12_or_later
-    depends on OBSOLETE
-
-config ISL_V_0_11_1
-    bool
-    prompt "0.11.1 (OBSOLETE)"
-    depends on !CC_GCC_4_9_or_later
-    depends on OBSOLETE
 
-endchoice
+source "config/versions/isl.in"
 
-config ISL_V_0_16_or_later
+config ISL_NEEDS_WITH_GMP
     bool
-    select ISL_V_0_15_or_later
+    default y if !ISL_0_12_or_later
 
-config ISL_V_0_15_or_later
+config ISL_HAS_WITH_PIPLIB
     bool
-    select ISL_V_0_14_or_later
-
-config ISL_V_0_14_or_later
-    bool
-    select ISL_V_0_12_or_later
-
-config ISL_V_0_12_or_later
-    bool
-
-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
+    default y if !ISL_0_14_or_later
diff --git a/config/companion_libs/libelf.in b/config/companion_libs/libelf.in
index b01ab36..5b268c1 100644
--- a/config/companion_libs/libelf.in
+++ b/config/companion_libs/libelf.in
@@ -1,25 +1,3 @@
 # libelf config file
 
-choice
-    bool
-    prompt "libelf version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBELF_V_0_8_13
-    bool
-    prompt "0.8.13"
-
-config LIBELF_V_0_8_12
-    bool
-    prompt "0.8.12 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config LIBELF_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "0.8.13" if LIBELF_V_0_8_13
-    default "0.8.12" if LIBELF_V_0_8_12
+source "config/versions/libelf.in"
diff --git a/config/companion_libs/libiconv.in b/config/companion_libs/libiconv.in
index d871681..99d3365 100644
--- a/config/companion_libs/libiconv.in
+++ b/config/companion_libs/libiconv.in
@@ -1,24 +1,3 @@
 # libiconv options
 
-choice
-    bool
-    prompt "libiconv version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBICONV_V_1_15
-    bool
-    prompt "1.15"
-
-config LIBICONV_V_1_14
-    bool
-    prompt "1.14"
-
-endchoice
-
-config LIBICONV_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "1.15" if LIBICONV_V_1_15
-    default "1.14" if LIBICONV_V_1_14
+source "config/versions/libiconv.in"
diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in
index cd8132d..790e755 100644
--- a/config/companion_libs/mpc.in
+++ b/config/companion_libs/mpc.in
@@ -1,61 +1,3 @@
 # MPC options
 
-choice
-    bool
-    prompt "MPC version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config MPC_V_1_0_3
-    bool
-    prompt "1.0.3"
-
-config MPC_V_1_0_2
-    bool
-    prompt "1.0.2 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPC_V_1_0_1
-    bool
-    prompt "1.0.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPC_V_1_0
-    bool
-    prompt "1.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPC_V_0_9
-    bool
-    prompt "0.9 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPC_V_0_8_2
-    bool
-    prompt "0.8.2 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPC_V_0_8_1
-    bool
-    prompt "0.8.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPC_V_0_7
-    bool
-    prompt "0.7 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config MPC_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "1.0.3" if MPC_V_1_0_3
-    default "1.0.2" if MPC_V_1_0_2
-    default "1.0.1" if MPC_V_1_0_1
-    default "1.0" if MPC_V_1_0
-    default "0.9" if MPC_V_0_9
-    default "0.8.2" if MPC_V_0_8_2
-    default "0.8.1" if MPC_V_0_8_1
-    default "0.7" if MPC_V_0_7
+source "config/versions/mpc.in"
diff --git a/config/companion_libs/mpfr.in b/config/companion_libs/mpfr.in
index ce33b3d..5ed7ac8 100644
--- a/config/companion_libs/mpfr.in
+++ b/config/companion_libs/mpfr.in
@@ -1,67 +1,3 @@
 # GMP options
 
-choice
-    bool
-    prompt "MPFR version"
-# 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 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPFR_V_3_1_2
-    bool
-    prompt "3.1.2 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPFR_V_3_1_0
-    bool
-    prompt "3.1.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPFR_V_3_0_1
-    bool
-    prompt "3.0.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPFR_V_3_0_0
-    bool
-    prompt "3.0.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPFR_V_2_4_2
-    bool
-    prompt "2.4.2 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPFR_V_2_4_1
-    bool
-    prompt "2.4.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config MPFR_V_2_4_0
-    bool
-    prompt "2.4.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-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
-    default "3.0.1" if MPFR_V_3_0_1
-    default "3.0.0" if MPFR_V_3_0_0
-    default "2.4.2" if MPFR_V_2_4_2
-    default "2.4.1" if MPFR_V_2_4_1
-    default "2.4.0" if MPFR_V_2_4_0
+source "config/versions/mpfr.in"
diff --git a/config/companion_libs/ncurses.in b/config/companion_libs/ncurses.in
index 68ecbb7..7087fbe 100644
--- a/config/companion_libs/ncurses.in
+++ b/config/companion_libs/ncurses.in
@@ -1,22 +1,6 @@
 # expat config file
 
-choice
-    bool
-    prompt "ncurses version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config NCURSES_V_6_0
-    bool
-    prompt "6.0"
-
-endchoice
-
-config NCURSES_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "6.0" if NCURSES_V_6_0
+source "config/versions/ncurses.in"
 
 config NCURSES_NEW_ABI
     bool "ncurses 6.0 ABI support"
diff --git a/config/companion_libs/zlib.in b/config/companion_libs/zlib.in
index df93682..70668e2 100644
--- a/config/companion_libs/zlib.in
+++ b/config/companion_libs/zlib.in
@@ -1,19 +1,3 @@
 # Zlib options
 
-choice
-    bool
-    prompt "zlib version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config ZLIB_V_1_2_11
-    bool
-    prompt "1.2.11"
-
-endchoice
-
-config ZLIB_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "1.2.11" if ZLIB_V_1_2_11
+source "config/versions/zlib.in"
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
diff --git a/config/debug/duma.in b/config/debug/duma.in
index f9e727b..6039a25 100644
--- a/config/debug/duma.in
+++ b/config/debug/duma.in
@@ -7,6 +7,8 @@
 ## help A memory bound checker, with additional features.
 ## help Formerly known as Electric Fence.
 
+source "config/versions/duma.in"
+
 config DUMA_SO
     bool
     prompt "Build a shared library"
@@ -18,21 +20,3 @@ config DUMA_CUSTOM_WRAPPER
     prompt "Install custom D.U.M.A wrapper"
     default y
     depends on DUMA_SO
-
-choice
-    bool
-    prompt "D.U.M.A. version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config DUMA_V_2_5_15
-    bool
-    prompt "2_5_15"
-
-endchoice
-
-config DUMA_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2_5_15" if DUMA_V_2_5_15
diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index b1d101b..3fe486f 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -2,326 +2,20 @@
 
 ## help gdb is the GNU debugger
 
+source "config/versions/gdb.in"
+
 source "config/debug/gdb.in.cross"
 source "config/debug/gdb.in.native"
 source "config/debug/gdb.in.gdbserver"
 
-comment "gdb version"
-
-config GDB_CUSTOM
-    bool
-    prompt "Custom gdb"
-    depends on EXPERIMENTAL
-    select GDB_8_0_or_later
-    help
-      The choosen gdb version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-if GDB_CUSTOM
-
-config GDB_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom gdb source"
-    help
-      Enter the path to the directory or tarball of your source for gcc.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component, gcc, and the version is set
-      below in the custom version string.
-
-config GDB_CUSTOM_VERSION
-    string
-    prompt "Custom GDB version"
-    help
-      Enter the version number for your custom gdb.
-
-config GDB_VERSION
-    string
-    default GDB_CUSTOM_VERSION
-
-endif # GDB_CUSTOM
-
-if ! GDB_CUSTOM
-
-config DEBUG_GDB_SHOW_LINARO
-    bool
-    prompt "Show Linaro versions"
-    depends on OBSOLETE
-    help
-      Linaro is maintaining some advanced/more stable/experimental versions
-      of gdb, especially for the ARM architecture.
-
-      Those versions have not been blessed by the gdb community (nor have they
-      been cursed either!), but they look to be pretty much stable, and even
-      more stable than the upstream versions. YMMV...
-
-      If you do not know what this Linaro stuff is, then simply say 'n' here,
-      and rest in peace. OTOH, if you know what you are doing, you will be
-      able to use and enjoy :-) the Linaro versions by saying 'y' here.
-
-      Linaro: http://www.linaro.org/
-
-choice
-    bool
-    prompt "gdb version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config GDB_V_8_0
-    bool
-    prompt "8.0"
-    select GDB_8_0_or_later
-
-config GDB_V_7_12_1
-    bool
-    prompt "7.12.1"
-    select GDB_7_12_or_later
-
-config GDB_V_7_11_1
-    bool
-    prompt "7.11.1"
-    select GDB_7_2_or_later
-
-config GDB_V_7_10_1
-    bool
-    prompt "7.10.1 (OBSOLETE)"
-    select GDB_7_2_or_later
-    depends on OBSOLETE
-
-config GDB_V_7_10
-    bool
-    prompt "7.10 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_9_1
-    bool
-    prompt "7.9.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_9
-    bool
-    prompt "7.9 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_8
-    bool
-    prompt "linaro-7.8-2014.09 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_8_2
-    bool
-    prompt "7.8.2 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-
-config GDB_V_7_8_1
-    bool
-    prompt "7.8.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_8
-    bool
-    prompt "7.8 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_7_1
-    bool
-    prompt "linaro-7.7.1-2014.06 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_7_1
-    bool
-    prompt "7.7.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_7
-    bool
-    prompt "linaro-7.7-2014.05 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_7
-    bool
-    prompt "7.7 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_6
-    bool
-    prompt "linaro-7.6.1-2013.10 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    select GDB_7_2_or_later
-
-config GDB_V_7_6_1
-    bool
-    prompt "7.6.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_5
-    bool
-    prompt "linaro-7.5-2012.12 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_5_1
-    bool
-    prompt "7.5.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_4
-    bool
-    prompt "linaro-7.4-2012.06 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_4_1
-    bool
-    prompt "7.4.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_4
-    bool
-    prompt "7.4 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_linaro_7_3
-    bool
-    prompt "linaro-7.3-2011.12 (OBSOLETE)"
-    depends on DEBUG_GDB_SHOW_LINARO
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_3_1
-    bool
-    prompt "7.3.1 (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_3a
-    bool
-    prompt "7.3a (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_2a
-    bool
-    prompt "7.2a (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_2_or_later
-
-config GDB_V_7_1a
-    bool
-    prompt "7.1a (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_0_or_later
-
-config GDB_V_7_0_1a
-    bool
-    prompt "7.0.1a (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_0_or_later
-
-config GDB_V_7_0a
-    bool
-    prompt "7.0a (OBSOLETE)"
-    depends on OBSOLETE
-    select GDB_7_0_or_later
-
-config GDB_V_6_8a
-    bool
-    prompt "6.8a (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-endif # ! GDB_CUSTOM
-
-config GDB_8_0_or_later
-    bool
-    select GDB_7_12_or_later
-
-config GDB_7_12_or_later
-    bool
-    select GDB_7_2_or_later
-
-config GDB_7_2_or_later
-    bool
-    select GDB_7_0_or_later
-
-config GDB_7_0_or_later
-    bool
-    select GDB_HAS_PKGVERSION_BUGURL
-    select GDB_HAS_PYTHON
-    select GDB_INSTALL_GDBINIT
-
 config GDB_HAS_PKGVERSION_BUGURL
     bool
+    default y if GDB_7_0_or_later
 
 config GDB_HAS_PYTHON
     bool
+    default y if GDB_7_0_or_later
 
 config GDB_INSTALL_GDBINIT
     bool
-
-# GDB 8.0 now requires C++ for build. GDB 7.12 offered a configure
-# switch to fall back to C.
-config GDB_TARGET_DISABLE_CXX_BUILD
-    def_bool y
-    depends on GDB_7_12_or_later && !GDB_8_0_or_later
-
-if ! GDB_CUSTOM
-
-config GDB_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "8.0" if GDB_V_8_0
-    default "7.12.1" if GDB_V_7_12_1
-    default "7.11.1" if GDB_V_7_11_1
-    default "7.10.1" if GDB_V_7_10_1
-    default "7.10" if GDB_V_7_10
-    default "7.9.1" if GDB_V_7_9_1
-    default "7.9" if GDB_V_7_9
-    default "7.8.2" if GDB_V_7_8_2
-    default "linaro-7.8-2014.09" if GDB_V_linaro_7_8
-    default "7.8.1" if GDB_V_7_8_1
-    default "7.8" if GDB_V_7_8
-    default "linaro-7.7.1-2014.06-1" if GDB_V_linaro_7_7_1
-    default "7.7.1" if GDB_V_7_7_1
-    default "linaro-7.7-2014.05" if GDB_V_linaro_7_7
-    default "7.7" if GDB_V_7_7
-    default "linaro-7.6.1-2013.10" if GDB_V_linaro_7_6
-    default "7.6.1" if GDB_V_7_6_1
-    default "linaro-7.5-2012.12" if GDB_V_linaro_7_5
-    default "7.5.1" if GDB_V_7_5_1
-    default "linaro-7.4-2012.06" if GDB_V_linaro_7_4
-    default "7.4.1" if GDB_V_7_4_1
-    default "7.4" if GDB_V_7_4
-    default "linaro-7.3-2011.12" if GDB_V_linaro_7_3
-    default "7.3.1" if GDB_V_7_3_1
-    default "7.3a" if GDB_V_7_3a
-    default "7.2a" if GDB_V_7_2a
-    default "7.1a" if GDB_V_7_1a
-    default "7.0.1a" if GDB_V_7_0_1a
-    default "7.0a" if GDB_V_7_0a
-    default "6.8a" if GDB_V_6_8a
-
-endif # ! GDB_CUSTOM
+    default y if GDB_7_0_or_later
diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in
index fab6b81..cb511a4 100644
--- a/config/debug/ltrace.in
+++ b/config/debug/ltrace.in
@@ -8,33 +8,11 @@
 ## help the executed process and the signals which are received by that process.
 ## help It can also intercept and print the system calls executed by the program.
 
-choice
-    bool
-    prompt "ltrace version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LTRACE_V_0_7_3
-    bool
-    prompt "0.7.3"
-
-config LTRACE_V_0_5_3
-    bool
-    prompt "0.5.3 (OBSOLETE)"
-    depends on OBSOLETE
-    select LTRACE_0_5_3_CONFIGURE
-
-endchoice
-
-config LTRACE_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "0.7.3" if LTRACE_V_0_7_3
-    default "0.5.3" if LTRACE_V_0_5_3
+source "config/versions/ltrace.in"
 
 # Ltrace 0.5.3 had a unique hand-crafted configure script that has to be
 # run differently from any preceding or following releases. This serves
 # as a reminder to remove that code once 0.5.3 support is dropped.
 config LTRACE_0_5_3_CONFIGURE
     bool
+    default y if LTRACE_V_0_5_3
diff --git a/config/debug/strace.in b/config/debug/strace.in
index e77702b..8062d15 100644
--- a/config/debug/strace.in
+++ b/config/debug/strace.in
@@ -2,97 +2,4 @@
 
 ## depends on ! LIBC_bionic
 
-choice
-    bool
-    prompt "strace version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config STRACE_V_4_16
-    bool
-    prompt "4.16"
-
-config STRACE_V_4_15
-    bool
-    prompt "4.15"
-
-config STRACE_V_4_14
-    bool
-    prompt "4.14 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_13
-    bool
-    prompt "4.13 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_12
-    bool
-    prompt "4.12 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_11
-    bool
-    prompt "4.11 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_10
-    bool
-    prompt "4.10 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_9
-    bool
-    prompt "4.9 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_8
-    bool
-    prompt "4.8 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_7
-    bool
-    prompt "4.7 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_6
-    bool
-    prompt "4.6 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_5_20
-    bool
-    prompt "4.5.20 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_5_19
-    bool
-    prompt "4.5.19 (OBSOLETE)"
-    depends on OBSOLETE
-
-config STRACE_V_4_5_18
-    bool
-    prompt "4.5.18 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config STRACE_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "4.16" if STRACE_V_4_16
-    default "4.15" if STRACE_V_4_15
-    default "4.14" if STRACE_V_4_14
-    default "4.13" if STRACE_V_4_13
-    default "4.12" if STRACE_V_4_12
-    default "4.11" if STRACE_V_4_11
-    default "4.10" if STRACE_V_4_10
-    default "4.9" if STRACE_V_4_9
-    default "4.8" if STRACE_V_4_8
-    default "4.7" if STRACE_V_4_7
-    default "4.6" if STRACE_V_4_6
-    default "4.5.20" if STRACE_V_4_5_20
-    default "4.5.19" if STRACE_V_4_5_19
-    default "4.5.18" if STRACE_V_4_5_18
+source "config/versions/strace.in"