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 + * 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 () {