From dfff6628178e75cc2d23ad574f14bc540249258c Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Tue, 15 Dec 2009 19:11:42 -0500 Subject: [PATCH] Import M4 detection fix from Autoconf. Reported by Eric Blake. * m4/m4.m4: Copy serial 10. --- ChangeLog | 6 ++++++ m4/m4.m4 | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6a2750e..d419d504 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-12-15 Joel E. Denny + + Import M4 detection fix from Autoconf. + Reported by Eric Blake. + * m4/m4.m4: Copy serial 10. + 2009-12-14 Joel E. Denny Enable assertion output and --disable-assert for configure. diff --git a/m4/m4.m4 b/m4/m4.m4 index 096fb287..c6b64b08 100644 --- a/m4/m4.m4 +++ b/m4/m4.m4 @@ -1,4 +1,4 @@ -# m4.m4 serial 9 +# m4.m4 serial 10 # Copyright (C) 2000, 2006, 2007, 2008, 2009 Free Software Foundation, # Inc. @@ -29,7 +29,7 @@ AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4 gnum4], ac_snippet=change'quote(<,>)in''dir(,mac,bug)' ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl test -z "`$ac_path_M4 -F conftest.m4f &1`" \ - && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \ + && test -z "`AS_ECHO([$ac_snippet]) | $ac_path_M4 --trace=mac 2>&1`" \ && test -f conftest.m4f \ && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=: rm -f conftest.m4f], -- 2.47.2