From 6fb342ecfeebcd32ab9f434ddcc6ee7fd0c0079d Mon Sep 17 00:00:00 2001 From: Russell Bryant <russell@russellbryant.com> Date: Mon, 13 Nov 2006 05:51:30 +0000 Subject: [PATCH] Merged revisions 47527 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r47527 | russell | 2006-11-13 00:48:18 -0500 (Mon, 13 Nov 2006) | 5 lines AC_PROG_SED is included in autoconf 2.60, but apparently it is not included in 2.59. So, to maintain compatability with 2.59 since it is a small change, copy this macro into acinclude.m4 and rename it to AST_PROG_SED. (issue #8345) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47529 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- acinclude.m4 | 23 ++++++++++++++++++++++- configure | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index a5d147ed74..a00f673a10 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -577,7 +577,7 @@ AC_DEFUN([AST_PROG_LD], [assume the C compiler uses GNU ld @<:@default=no@:>@])], [test "$withval" = no || with_gnu_ld=yes], [with_gnu_ld=no]) -AC_REQUIRE([AC_PROG_SED])dnl +AC_REQUIRE([AST_PROG_SED])dnl AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl @@ -682,4 +682,25 @@ m4_ifndef([AST_PROG_EGREP], [AC_DEFUN([AST_PROG_EGREP], AC_SUBST([EGREP]) ])]) # AST_PROG_EGREP +# AST_PROG_SED +# ----------- +# Check for a fully functional sed program that truncates +# as few characters as possible. Prefer GNU sed if found. +AC_DEFUN([AST_PROG_SED], +[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED, + [dnl ac_script should not contain more than 99 commands (for HP-UX sed), + dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed. + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" | sed 99q >conftest.sed + $as_unset ac_script || ac_script= + _AC_PATH_PROG_FEATURE_CHECK(SED, [sed gsed], + [_AC_FEATURE_CHECK_LENGTH([ac_path_SED], [ac_cv_path_SED], + ["$ac_path_SED" -f conftest.sed])])]) + SED="$ac_cv_path_SED" + AC_SUBST([SED])dnl + rm -f conftest.sed +])# AST_PROG_SED diff --git a/configure b/configure index 7aeb120433..d3ab2efb94 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 47305 . +# From configure.ac Revision: 47328 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.60a. # -- GitLab