[asterisk-commits] russell: trunk r47529 - in /trunk: ./ acinclude.m4 configure

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sun Nov 12 23:51:30 2006
New Revision: 47529

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47529
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/acinclude.m4
    trunk/configure

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/acinclude.m4
URL: http://svn.digium.com/view/asterisk/trunk/acinclude.m4?view=diff&rev=47529&r1=47528&r2=47529
==============================================================================
--- trunk/acinclude.m4 (original)
+++ trunk/acinclude.m4 Sun Nov 12 23:51:30 2006
@@ -577,7 +577,7 @@
 	[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 @@
  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
+

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?view=diff&rev=47529&r1=47528&r2=47529
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Sun Nov 12 23:51:30 2006
@@ -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.
 #