--- glibc-configure.bad	2009-10-28 23:22:52.000000000 +0100
+++ glibc-configure.bad	2009-10-28 23:39:08.000000000 +0100
@@ -4899,7 +4899,7 @@ 
   # Found it, now check the version.
   { $as_echo "$as_me:$LINENO: checking version of $LD" >&5
 $as_echo_n "checking version of $LD... " >&6; }
-  ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
+  ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU.*ld.*Binutils.\([0-9][0-9]*\.[0-9.]*\)\(.*\).*$/\1/p'`
   case $ac_prog_version in
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
     2.1[3-9]*|[2-9].[2-9]*)
@@ -6494,7 +6494,7 @@ 
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }
   then
-    if { ac_try='${CC-cc} -Wl,--verbose 2>&1|grep DATA_SEGMENT_RELRO_END 1>&5'
+    if { ac_try='${CC-cc} -Wl,--help 2>&1|grep "z relro" 1>&5'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?