1.1 --- a/config/global/download_extract.in	Fri Apr 18 08:41:30 2008 +0000
     1.2 +++ b/config/global/download_extract.in	Fri Apr 18 22:16:28 2008 +0000
     1.3 @@ -74,7 +74,8 @@
     1.4  
     1.5  config PROXY_TYPE_SOCKS
     1.6      bool
     1.7 -    prompt "SOCKS 4/5 proxy"
     1.8 +    prompt "SOCKS 4/5 proxy (EXPERIMENTAL)"
     1.9 +    depends on EXPERIMENTAL
    1.10      help
    1.11        Use a Socks 4/5 proxy to connect to the internet.
    1.12        All protocols can get tunneled through this kind of proxy (depending
    1.13 @@ -100,17 +101,35 @@
    1.14  choice
    1.15      bool
    1.16      prompt "type"
    1.17 -    default PROXY_TYPE_SOCKS_5
    1.18 +    default PROXY_TYPE_SOCKS_SYS
    1.19 +
    1.20 +config PROXY_TYPE_SOCKS_SYS
    1.21 +    bool
    1.22 +    prompt "Use system settings"
    1.23 +    help
    1.24 +      Use that if your system is already configured to
    1.25 +      connect to SOCKS 4/5 proxies.
    1.26 +
    1.27 +config PROXY_TYPE_SOCKS_AUTO
    1.28 +    bool
    1.29 +    prompt "Auto"
    1.30 +    help
    1.31 +      crosstool-NG will attempt to guess what type of
    1.32 +      SOCKS version the proxy speaks.
    1.33 +
    1.34 +config PROXY_TYPE_SOCKS_4
    1.35 +    bool
    1.36 +    prompt "SOCKS 4"
    1.37  
    1.38  config PROXY_TYPE_SOCKS_5
    1.39      bool
    1.40      prompt "SOCKS 5"
    1.41  
    1.42 -config PROXY_TYPE_SOCKS_4
    1.43 -    bool
    1.44 -    prompt "SOCKS 4"
    1.45 +endchoice
    1.46  
    1.47 -endchoice
    1.48 +if ! PROXY_TYPE_SOCKS_SYS
    1.49 +
    1.50 +comment "THIS IS HIGHLY EXPERIMENTAL!!!"
    1.51  
    1.52  config PROXY_HOST
    1.53      string
    1.54 @@ -129,16 +148,20 @@
    1.55      string
    1.56      prompt "password"
    1.57  
    1.58 +endif # ! PROXY_TYPE_SOCKS_SYS
    1.59 +
    1.60  endif # USE_SOCKS_PROXY
    1.61  
    1.62  endchoice
    1.63  
    1.64  config PROXY_TYPE
    1.65      string
    1.66 -    default "none" if PROXY_TYPE_NONE
    1.67 -    default "http" if PROXY_TYPE_HTTP
    1.68 -    default "socks5" if PROXY_TYPE_SOCKS_5
    1.69 -    default "socks4" if PROXY_TYPE_SOCKS_4
    1.70 +    default "none"      if PROXY_TYPE_NONE
    1.71 +    default "http"      if PROXY_TYPE_HTTP
    1.72 +    default "sockssys"  if PROXY_TYPE_SOCKS_SYS
    1.73 +    default "socksauto" if PROXY_TYPE_SOCKS_AUTO
    1.74 +    default "socks4"    if PROXY_TYPE_SOCKS_4
    1.75 +    default "socks5"    if PROXY_TYPE_SOCKS_5
    1.76  
    1.77  # Force restore indentation
    1.78  config BREAK_INDENT