diff -r 3fb8b4acdc4a -r bc439f6537ae config/libc/eglibc.in
--- a/config/libc/eglibc.in	Mon Oct 18 23:32:02 2010 -0700
+++ b/config/libc/eglibc.in	Sun Jan 02 22:33:04 2011 +0100
@@ -18,45 +18,45 @@
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
-config EGLIBC_V_2_12
+config LIBC_EGLIBC_V_2_12
     bool
     prompt "2_12"
     depends on EXPERIMENTAL
 
-config EGLIBC_V_2_11
+config LIBC_EGLIBC_V_2_11
     bool
     prompt "2_11"
     depends on EXPERIMENTAL
 
-config EGLIBC_V_2_10
+config LIBC_EGLIBC_V_2_10
     bool
     prompt "2_10"
 
-config EGLIBC_V_2_9
+config LIBC_EGLIBC_V_2_9
     bool
     prompt "2_9"
 
-config EGLIBC_V_2_8
+config LIBC_EGLIBC_V_2_8
     bool
     prompt "2_8 (OBSOLETE)"
     depends on OBSOLETE
 
-config EGLIBC_V_2_7
+config LIBC_EGLIBC_V_2_7
     bool
     prompt "2_7 (OBSOLETE)"
     depends on OBSOLETE
 
-config EGLIBC_V_2_6
+config LIBC_EGLIBC_V_2_6
     bool
     prompt "2_6 (OBSOLETE)"
     depends on OBSOLETE
 
-config EGLIBC_V_2_5
+config LIBC_EGLIBC_V_2_5
     bool
     prompt "2_5 (OBSOLETE)"
     depends on OBSOLETE
 
-config EGLIBC_V_TRUNK
+config LIBC_EGLIBC_V_TRUNK
     bool
     prompt "'trunk'"
     help
@@ -68,15 +68,15 @@
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
-    default "2_12" if EGLIBC_V_2_12
-    default "2_11" if EGLIBC_V_2_11
-    default "2_10" if EGLIBC_V_2_10
-    default "2_9" if EGLIBC_V_2_9
-    default "2_8" if EGLIBC_V_2_8
-    default "2_7" if EGLIBC_V_2_7
-    default "2_6" if EGLIBC_V_2_6
-    default "2_5" if EGLIBC_V_2_5
-    default "trunk" if EGLIBC_V_TRUNK
+    default "2_12" if LIBC_EGLIBC_V_2_12
+    default "2_11" if LIBC_EGLIBC_V_2_11
+    default "2_10" if LIBC_EGLIBC_V_2_10
+    default "2_9" if LIBC_EGLIBC_V_2_9
+    default "2_8" if LIBC_EGLIBC_V_2_8
+    default "2_7" if LIBC_EGLIBC_V_2_7
+    default "2_6" if LIBC_EGLIBC_V_2_6
+    default "2_5" if LIBC_EGLIBC_V_2_5
+    default "trunk" if LIBC_EGLIBC_V_TRUNK
 
 config EGLIBC_REVISION
     string
@@ -97,8 +97,8 @@
 config EGLIBC_CHECKOUT
     bool
     prompt "checkout instead of export"
-    default y if EGLIBC_V_TRUNK
-    default n if ! EGLIBC_V_TRUNK
+    default y if LIBC_EGLIBC_V_TRUNK
+    default n if ! LIBC_EGLIBC_V_TRUNK
     help
       By default, the eglibc download will be an export of the subversion
       repository. If you say 'y' here, then the repository will instead be