diff -r bd2529ef6665 -r 13df2720b374 config/debug/gdb.in.cross
--- a/config/debug/gdb.in.cross	Sat Oct 08 22:57:21 2011 +0200
+++ b/config/debug/gdb.in.cross	Fri Oct 14 22:44:24 2011 +0200
@@ -3,18 +3,10 @@
 config STATIC_TOOLCHAIN
     select GDB_CROSS_STATIC if GDB_CROSS
 
-comment "Cross-gdb - disabled (requires expat; re-run ./configure to enable)"
-    depends on !CONFIGURE_has_expat
-
-comment "Static cross-gdb - disabled (requires static expat; re-run ./configure to enable)"
-    depends on STATIC_TOOLCHAIN && !CONFIGURE_has_static_expat
-
 config GDB_CROSS
     bool
     prompt "Cross-gdb"
     default y
-    depends on CONFIGURE_has_expat
-    depends on !STATIC_TOOLCHAIN || CONFIGURE_has_static_expat
     select GDB_GDBSERVER if ! BARE_METAL
     help
       Build and install a cross-gdb for the target, to run on host.
@@ -24,8 +16,7 @@
 config GDB_CROSS_STATIC
     bool
     prompt "Build a static cross gdb"
-    depends on CONFIGURE_static_link_ok
-    depends on CONFIGURE_has_static_expat
+    select WANTS_STATIC_LINK
     help
       A static cross gdb can be usefull if you debug on a machine that is
       not the one that is used to compile the toolchain.
@@ -36,7 +27,6 @@
 config GDB_CROSS_PYTHON
     bool
     prompt "Enable python scripting"
-    depends on CONFIGURE_has_python
     depends on ! GDB_CROSS_STATIC
     default y
     help