diff -r a1370757e6a1 -r b488b4815f9b config/companion_libs.in
--- a/config/companion_libs.in	Wed Feb 17 23:47:47 2010 +0100
+++ b/config/companion_libs.in	Thu Feb 18 20:43:31 2010 +0100
@@ -6,6 +6,10 @@
 
 comment "FIXME: check real dependencies!!!"
 
+config COMPLIBS
+    bool
+    default n
+
 config WRAPPER_NEEDED
     bool
     default n
@@ -13,6 +17,7 @@
 config GMP
     bool
     prompt "GMP"
+    select COMPLIBS
     select WRAPPER_NEEDED
     help
       gcc 4.3.0 and above requires GMP to build some frontends, and some
@@ -31,6 +36,7 @@
     bool
     prompt "MPFR"
     select GMP
+    select COMPLIBS
     select WRAPPER_NEEDED
     help
       gcc 4.3.0 and above requires MPFR to build some frontends, and some
@@ -50,6 +56,7 @@
     prompt "PPL"
     select GMP
     select MPFR
+    select COMPLIBS
     select WRAPPER_NEEDED
     help
       gcc-4.4.0 and above requires PPL to build some parts of the optimiser
@@ -65,6 +72,7 @@
     select GMP
     select MPFR
     select PPL
+    select COMPLIBS
     select WRAPPER_NEEDED
     help
       gcc-4.4.0 and above requires CLooG/PPL to build some parts of the
@@ -81,6 +89,7 @@
     select MPFR
     select PPL
     select CLOOG
+    select COMPLIBS
     select WRAPPER_NEEDED
     help
       gcc-4.4.0 and above can also optionally use MPC to enable additional
@@ -111,12 +120,13 @@
     bool
 
 comment "Companion libraries common options"
-    depends on GMP || MPFR || PPL || CLOOG || MPC
+    depends on COMPLIBS || WRAPPER_NEEDED
+
+if COMPLIBS
 
 config COMP_LIBS_CHECK
     bool
     prompt "|  Check the companion libraries builds (!!! READ HELP!!!)"
-    depends on GMP || MPFR || PPL || CLOOG || MPC
     default n
     help
       It is highly recommended to check the newly built companion libraries.
@@ -132,10 +142,9 @@
       building PPL on my machine takes roughly 1'40", while checking it takes
       about 1h40'...
 
-config COMP_LIBS_TARGET
+config COMPLIBS_TARGET
     bool
     prompt "|  Build companion libraries for the target"
-    depends on GMP || MPFR || PPL || CLOOG || MPC
     depends on ! BARE_METAL
     default n
     help
@@ -145,6 +154,8 @@
       
       Please note that for now, crosstool-NG can only build GMP and MPFR so.
 
+endif # COMPLIBS
+
 choice
     bool
     prompt "|  Install tools wrapper as:"