summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2012-08-22 12:58:18 -0700
committerRoland McGrath <roland@hack.frob.com>2012-08-22 12:58:18 -0700
commit07e515506660b1d0c1934dc0ac0e2ac5e7a4a760 (patch)
tree91ee4cf9802e5cc6f4460e2a91411e62d149f597
parent35a5b08bd4a5fc34d171480f32b9a235a94ff692 (diff)
downloadglibc-07e515506660b1d0c1934dc0ac0e2ac5e7a4a760.tar.gz
Fix sed configure check for newer sed --version output.
-rw-r--r--ChangeLog6
-rwxr-xr-xconfigure2
-rw-r--r--configure.in2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fbaadcac67..8e64d803d2 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 9dddf3c58f..a573bfec00 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 f5dbff68cc..1b05c87233 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")