summaryrefslogtreecommitdiff
path: root/m4/m4.m4
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2007-02-02 14:07:38 +0000
committerEric Blake <ebb9@byu.net>2007-02-02 14:07:38 +0000
commitb6386a5ae722cde1d2db552f5d302ae5eb11ca96 (patch)
tree2ddbf4dc6e479873995f4243067ae4eb9d715490 /m4/m4.m4
parent82bce5064f14bfb60beb580bb304a2d460a03acd (diff)
downloadautoconf-b6386a5ae722cde1d2db552f5d302ae5eb11ca96.tar.gz
* m4/m4.m4 (AC_PROG_GNU_M4): Reject M4 1.4 through 1.4.4 as
broken. * configure.ac: Update error message. * NEWS: Note that M4 1.4.5 or later is now a hard dependency. Reported by Gary Vaughan and Jim Meyering, and problem analyzed by Stepan Kasal: http://lists.gnu.org/archive/html/bug-autoconf/2006-11/msg00025.html
Diffstat (limited to 'm4/m4.m4')
-rw-r--r--m4/m4.m418
1 files changed, 10 insertions, 8 deletions
diff --git a/m4/m4.m4 b/m4/m4.m4
index b6fb9eab..70b99f89 100644
--- a/m4/m4.m4
+++ b/m4/m4.m4
@@ -1,22 +1,24 @@
-# m4.m4 serial 2
-dnl Copyright (C) 2000, 2006 Free Software Foundation, Inc.
+# m4.m4 serial 3
+dnl Copyright (C) 2000, 2006, 2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
# AC_PROG_GNU_M4
# --------------
-# Check for GNU m4, at least 1.3 (supports frozen files).
+# Check for GNU M4, at least 1.4.5 (all earlier versions had a bug in
+# trace support:
+# http://lists.gnu.org/archive/html/bug-gnu-utils/2006-11/msg00096.html)
# Also, check whether --error-output (through 1.4.x) or --debugfile (2.0)
# is supported, and AC_SUBST M4_DEBUGFILE accordingly.
AC_DEFUN([AC_PROG_GNU_M4],
[AC_PATH_PROGS([M4], [gm4 gnum4 m4], [m4])
-AC_CACHE_CHECK([whether m4 supports frozen files], [ac_cv_prog_gnu_m4],
+AC_CACHE_CHECK([whether m4 supports accurate traces], [ac_cv_prog_gnu_m4],
[ac_cv_prog_gnu_m4=no
-if test x"$M4" != x; then
- case `$M4 --help < /dev/null 2>&1` in
- *reload-state*) ac_cv_prog_gnu_m4=yes ;;
- esac
+dnl Creative quoting here to avoid raw dnl and ifdef in configure.
+if test x"$M4" != x \
+ && test -z "`echo if'def(mac,bug)d'nl | $M4 --trace=mac 2>&1`" ; then
+ ac_cv_prog_gnu_m4=yes
fi])
if test $ac_cv_prog_gnu_m4 = yes ; then
AC_CACHE_CHECK([how m4 supports trace files], [ac_cv_prog_gnu_m4_debugfile],