diff -r af092b4bf65c -r 1bb063c8a0ca config/companion_libs.in
--- a/config/companion_libs.in	Sun Apr 11 00:47:23 2010 +0200
+++ b/config/companion_libs.in	Mon Aug 23 23:18:49 2010 +0200
@@ -102,57 +102,22 @@
       can say 'Y' here, although it is unknown yet if any other component
       can use it.
 
-config GMP_TARGET
-    bool
-
-config MPFR_TARGET
-    bool
-    select GMP_TARGET
-
-config PPL_TARGET
-    bool
-    select GMP_TARGET
-    select MPFR_TARGET
-
-config CLOOG_TARGET
-    bool
-    select GMP_TARGET
-    select MPFR_TARGET
-    select PPL_TARGET
-
-config MPC_TARGET
-    bool
-    select GMP_TARGET
-    select MPFR_TARGET
-    select PPL_TARGET
-    select CLOOG_TARGET
-
 config LIBELF_TARGET
     bool
 
-if GMP || GMP_TARGET
-comment "GMP version needed to build for target"
-    depends on !GMP
+if GMP
 source "config/companion_libs/gmp.in"
 endif
-if MPFR || MPFR_TARGET
-comment "MPFR version needed to build for target"
-    depends on !MPFR
+if MPFR
 source "config/companion_libs/mpfr.in"
 endif
-if PPL || PPL_TARGET
-comment "PPL version needed to build for target"
-    depends on !PPL
+if PPL
 source "config/companion_libs/ppl.in"
 endif
-if CLOOG || CLOOG_TARGET
-comment "CLOOG version needed to build for target"
-    depends on !CLOOG
+if CLOOG
 source "config/companion_libs/cloog.in"
 endif
-if MPC || MPC_TARGET
-comment "MPC version needed to build for target"
-    depends on !MPC
+if MPC
 source "config/companion_libs/mpc.in"
 endif
 if LIBELF || LIBELF_TARGET