diff -r 5158aa602e58 -r 0ca0f85a4b2a config/companion_libs.in
--- a/config/companion_libs.in	Wed Dec 22 00:34:56 2010 +0100
+++ b/config/companion_libs.in	Wed Apr 06 22:30:57 2011 +0200
@@ -48,10 +48,6 @@
     bool
     default n
 
-config WRAPPER_NEEDED
-    bool
-    default n
-
 config GMP
     bool
     select COMPLIBS
@@ -113,11 +109,6 @@
 
 comment "Companion libraries common options"
 
-config COMPLIBS_BACKUP
-    bool
-    default y
-    depends on ! COMPLIBS_SHARED
-
 config COMPLIBS_CHECK
     bool
     prompt "Check the companion libraries builds (!!! READ HELP!!!)"
@@ -136,52 +127,6 @@
       building PPL on my machine takes roughly 1'40", while checking it takes
       about 1h40'...
 
-config COMPLIBS_SHARED
-    bool
-    prompt "Build shared companion libraries"
-    default n
-    depends on COMPLIBS
-    depends on ! STATIC_TOOLCHAIN
-    select WRAPPER_NEEDED
-    help
-      By default, the companion libraries will be build static. If you want to
-      build shared libraries, then you can say 'Y' here, but a wrapper will be
-      needed (see: "docs/4 - Building the toolchain.txt", in the section
-      "Tools wrapper").
-      
-      It is highly recommended that you keep static libraries.
-
-choice
-    bool
-    prompt "|  Install tools wrapper as:"
-    depends on WRAPPER_NEEDED
-    default TOOLS_WRAPPER_SHELL
-
-config TOOLS_WRAPPER_SCRIPT
-    bool
-    prompt "shell script"
-    help
-      If your host has a shell, then you should say 'Y' here, to use
-      a (very very simple) shell script as wrapper.
-      
-      See: "docs/4 - Building the toolchain.txt", in the section "Tools wrapper".
-
-config TOOLS_WRAPPER_EXEC
-    bool
-    prompt "executable"
-    help
-      If your host lacks a shell, then you should say 'Y' here, to use
-      an executable.
-      
-      See: "docs/4 - Building the toolchain.txt", in the section "Tools wrapper".
-
-endchoice
-
-config TOOLS_WRAPPER
-    string
-    default "script" if TOOLS_WRAPPER_SCRIPT
-    default "exec"   if TOOLS_WRAPPER_EXEC
-
 endif # COMPLIBS
 
 endmenu