From 9ea8de81e3a3dc9e674d45b5cd4cded941b3eedc Mon Sep 17 00:00:00 2001
From: Kolja Waschk <urjtag@ixo.de>
Date: Sat, 19 Apr 2008 10:11:29 +0000
Subject: [PATCH] [ 1946114 ] make AC_PROG_SED workaround sane (Mike Frysinger)

git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1173 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
---
 jtag/ChangeLog    | 2 ++
 jtag/acinclude.m4 | 5 +++--
 jtag/configure.ac | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index f0ac4d49..e7ee53f3 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,5 +1,7 @@
 2008-04-19  Kolja Waschk <kawk>
 
+   * configure.ac, acinclude.m4: [ 1946114 ] make AC_PROG_SED
+     workaround sane (Mike Frysinger)
    * src/cmd/frequency.c: ensure that cable is initialized. Fixes
      [ 1933736 ] "frequency" command segfaults without args
 
diff --git a/jtag/acinclude.m4 b/jtag/acinclude.m4
index 1a11b65a..30065b09 100644
--- a/jtag/acinclude.m4
+++ b/jtag/acinclude.m4
@@ -101,7 +101,8 @@ AC_DEFUN([VL_LIB_READLINE], [
 # compatibility with autoconf-2.59. Can be removed from acinclude.m4 if
 # autoconf-2.60 or newer is required for other reasons.. 
 #
-AC_DEFUN([ACI_PROG_SED],
+m4_ifndef([AC_PROG_SED],[dnl
+AC_DEFUN([AC_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.
@@ -118,6 +119,6 @@ AC_DEFUN([ACI_PROG_SED],
  AC_SUBST([SED])dnl
  rm -f conftest.sed
 ])# ACI_PROG_SED
-
+])dnl
 
 
diff --git a/jtag/configure.ac b/jtag/configure.ac
index 8181acdc..d371872c 100644
--- a/jtag/configure.ac
+++ b/jtag/configure.ac
@@ -241,7 +241,7 @@ CPPFLAGS="$CPPFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/include"
 AC_PROG_LEX
 # check for modern version of flex
 AC_PROG_AWK
-ACI_PROG_SED
+AC_PROG_SED
 
 AS_IF([test "$LEX" == flex], [
    ver_ge_ver () {