1.1 --- a/config/debug/gdb.in.cross	Sat Oct 08 22:57:21 2011 +0200
     1.2 +++ b/config/debug/gdb.in.cross	Fri Oct 14 22:44:24 2011 +0200
     1.3 @@ -3,18 +3,10 @@
     1.4  config STATIC_TOOLCHAIN
     1.5      select GDB_CROSS_STATIC if GDB_CROSS
     1.6  
     1.7 -comment "Cross-gdb - disabled (requires expat; re-run ./configure to enable)"
     1.8 -    depends on !CONFIGURE_has_expat
     1.9 -
    1.10 -comment "Static cross-gdb - disabled (requires static expat; re-run ./configure to enable)"
    1.11 -    depends on STATIC_TOOLCHAIN && !CONFIGURE_has_static_expat
    1.12 -
    1.13  config GDB_CROSS
    1.14      bool
    1.15      prompt "Cross-gdb"
    1.16      default y
    1.17 -    depends on CONFIGURE_has_expat
    1.18 -    depends on !STATIC_TOOLCHAIN || CONFIGURE_has_static_expat
    1.19      select GDB_GDBSERVER if ! BARE_METAL
    1.20      help
    1.21        Build and install a cross-gdb for the target, to run on host.
    1.22 @@ -24,8 +16,7 @@
    1.23  config GDB_CROSS_STATIC
    1.24      bool
    1.25      prompt "Build a static cross gdb"
    1.26 -    depends on CONFIGURE_static_link_ok
    1.27 -    depends on CONFIGURE_has_static_expat
    1.28 +    select WANTS_STATIC_LINK
    1.29      help
    1.30        A static cross gdb can be usefull if you debug on a machine that is
    1.31        not the one that is used to compile the toolchain.
    1.32 @@ -36,7 +27,6 @@
    1.33  config GDB_CROSS_PYTHON
    1.34      bool
    1.35      prompt "Enable python scripting"
    1.36 -    depends on CONFIGURE_has_python
    1.37      depends on ! GDB_CROSS_STATIC
    1.38      default y
    1.39      help