* m4/m4.m4 (AC_PROG_GNU_M4): Check for m4 --debugfile support.

* bin/Makefile.am (edit): Substitute M4_DEBUGFILE.
* bin/autom4te.in (handle_m4): Favor --debugfile over misnamed
--error-output, to avoid warnings with M4 2.0.

diff --git a/ChangeLog b/ChangeLog
index 313a7a805bf75ec2ba86a8fce3f03934fe9a934d..9b9d71e52c6835e39b3bd85a40e31d5661116f7d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-19  Eric Blake  <ebb9@byu.net>
+
+       * m4/m4.m4 (AC_PROG_GNU_M4): Check for m4 --debugfile support.
+       * bin/Makefile.am (edit): Substitute M4_DEBUGFILE.
+       * bin/autom4te.in (handle_m4): Favor --debugfile over misnamed
+       --error-output, to avoid warnings with M4 2.0.
+
 2006-09-19  Stepan Kasal  <kasal@ucw.cz>
 
        * lib/autoconf/libs.m4 (AH_CHECK_LIB): Fix quoting, to be

diff --git a/bin/Makefile.am b/bin/Makefile.am
index f64858505f5e56e8a27989449057b7cd0f8f1d69..8a0c6af106c32de4a7e94dd998b5a8d9d04ce35e 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -2,7 +2,7 @@
 
 ## Makefile for Autoconf.
 
-## Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
+## Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
 ## Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
@@ -46,6 +46,7 @@ edit = sed \
        -e 's|@autoheader-name[@]|'`echo autoheader | sed '$(transform)'`'|g' \
        -e 's|@autom4te-name[@]|'`echo autom4te | sed '$(transform)'`'|g' \
        -e 's|@M4[@]|$(M4)|g' \
+       -e 's|@M4_DEBUGFILE[@]|$(M4_DEBUGFILE)|g' \
        -e 's|@AWK[@]|$(AWK)|g' \
        -e 's|@VERSION[@]|$(VERSION)|g' \
        -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \

diff --git a/bin/autom4te.in b/bin/autom4te.in
index ca6b5e6a089c74a0effc43878e0986c409a800ff..a26df1619169ec4c7fc1ce6368066742cd51b111 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -448,7 +448,7 @@ sub handle_m4 ($@)
 {
   my ($req, @macro) = @_;
 
-  # GNU m4 appends when using --error-output.
+  # GNU m4 appends when using --debugfile/--error-output.
   unlink ($tcache . $req->id . "t");
 
   # Run m4.
@@ -461,7 +461,7 @@ sub handle_m4 ($@)
           . join (' --include=', '', @include)
           . ' --debug=aflq'
           . (!exists $ENV{'AUTOM4TE_NO_FATAL'} ? ' --fatal-warning' : '')
-          . " --error-output=$tcache" . $req->id . "t"
+          . " @M4_DEBUGFILE@=$tcache" . $req->id . "t"
           . join (' --trace=',   '', sort @macro)
           . " " . files_to_options (@ARGV)
           . ' </dev/null'

diff --git a/m4/m4.m4 b/m4/m4.m4
index f42383d0ee11f8b30604e89a0d88a549d783e737..df8d8c45db36592b8cde2058985227bb2682b60c 100644 (file)
--- a/m4/m4.m4
+++ b/m4/m4.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2006 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,12 +18,23 @@
 # AC_PROG_GNU_M4
 # --------------
 # Check for GNU m4, at least 1.3 (supports frozen files).
+# 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_PATH_PROGS([M4], [gm4 gnum4 m4], [m4])
+AC_CACHE_CHECK([whether m4 supports frozen files], [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
-fi])])
+fi])
+if test $ac_cv_prog_gnu_m4 = yes ; then
+  AC_CACHE_CHECK([how m4 supports trace files], [ac_cv_prog_gnu_m4_debugfile],
+[case `$M4 --help < /dev/null 2>&1` in
+  *debugfile*) ac_cv_prog_gnu_m4_debugfile=--debugfile ;;
+  *) ac_cv_prog_gnu_m4_debugfile=--error-output ;;
+esac])
+AC_SUBST([M4_DEBUGFILE], $ac_cv_prog_gnu_m4_debugfile)
+fi
+])