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

This commit is contained in:
Dmitry V. Levin 2012-08-22 12:58:18 -07:00 committed by Roland McGrath
parent 35a5b08bd4
commit 07e5155066
3 changed files with 8 additions and 2 deletions

View File

@ -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.

2
configure vendored
View File

@ -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]*)

View File

@ -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")