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

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

11 files changed, 23 insertions, 448 deletions

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"