diff options
| author | Eric Blake <ebb9@byu.net> | 2006-09-20 02:44:51 +0000 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2006-09-20 02:44:51 +0000 |
| commit | 8dc951191c1083fda547d74b95897fd8adb7c6b6 (patch) | |
| tree | 97a5c34a7275d886ee616108adb07077c9de49ae /m4/m4.m4 | |
| parent | 8175799b1d7a39579b7e4bb29cbacbdd16df0c0e (diff) | |
| download | autoconf-8dc951191c1083fda547d74b95897fd8adb7c6b6.tar.gz | |
* 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.
Diffstat (limited to 'm4/m4.m4')
| -rw-r--r-- | m4/m4.m4 | 19 |
1 files changed, 15 insertions, 4 deletions
@@ -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 +]) |