GNU C Library master sources branch master updated. glibc-2.16-ports-merge-251-g07e5155

[roland at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  07e515506660b1d0c1934dc0ac0e2ac5e7a4a760 (commit)
      from  35a5b08bd4a5fc34d171480f32b9a235a94ff692 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=07e515506660b1d0c1934dc0ac0e2ac5e7a4a760

commit 07e515506660b1d0c1934dc0ac0e2ac5e7a4a760
Author: Dmitry V. Levin <ldv@altlinux.org>
Date:   Wed Aug 22 12:58:18 2012 -0700

    Fix sed configure check for newer sed --version output.

diff --git a/ChangeLog b/ChangeLog
index fbaadca..8e64d80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-22  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* configure.in (SED): Update AC_CHECK_PROG_VER's version extract regexp
+	to support sed >= 4.2.1-20-ga9bf076.
+	* configure: Regenerated.
+
 2012-08-22  Roland McGrath  <roland@hack.frob.com>
 
 	* csu/libc-start.c (apply_irel): Move extern declarations inside here.
diff --git a/configure b/configure
index 9dddf3c..a573bfe 100755
--- a/configure
+++ b/configure
@@ -4963,7 +4963,7 @@ else
   # Found it, now check the version.
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $SED" >&5
 $as_echo_n "checking version of $SED... " >&6; }
-  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed version \([0-9]*\.[0-9.]*\).*$/\1/p'`
+  ac_prog_version=`$SED --version 2>&1 | sed -n 's/^.*GNU sed[^0-9]* \([0-9]*\.[0-9.]*\).*$/\1/p'`
   case $ac_prog_version in
     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
     3.0[2-9]*|3.[1-9]*|[4-9]*)
diff --git a/configure.in b/configure.in
index f5dbff6..1b05c87 100644
--- a/configure.in
+++ b/configure.in
@@ -909,7 +909,7 @@ AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
   [4.[5-9]*|4.[1-9][0-9]*|[5-9].*],
   MAKEINFO=: aux_missing="$aux_missing makeinfo")
 AC_CHECK_PROG_VER(SED, sed, --version,
-  [GNU sed version \([0-9]*\.[0-9.]*\)],
+  [GNU sed[^0-9]* \([0-9]*\.[0-9.]*\)],
   [3.0[2-9]*|3.[1-9]*|[4-9]*],
   SED=: aux_missing="$aux_missing sed")
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog    |    6 ++++++
 configure    |    2 +-
 configure.in |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources