diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2009-07-12 13:50:24 +0200 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gnu.org> | 2009-07-13 21:46:08 +0200 |
| commit | 93a2679e007e0d414178aaff14b654e8b1ad26bc (patch) | |
| tree | 2c0bcf8062161571b975018ddecc591f53353adc /m4 | |
| parent | 81abbb1137c8f519c911b5edc264b281ccf4ce2a (diff) | |
| download | autoconf-93a2679e007e0d414178aaff14b654e8b1ad26bc.tar.gz | |
use m4 -g when available
M4sugar requires GNU m4 extensions to be enabled. Override
POSIXLY_CORRECT using -g.
* m4/m4.m4: Unset POSIXLY_CORRECT during first test. Test for -g.
Warn user if he has POSIXLY_CORRECT set but -g is not supported.
* bin/Makefile.am: Substitute @M4_GNU@ into generated files.
* bin/autom4te.in: Pass @M4_GNU@ to m4.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/m4.m4 | 22 |
1 files changed, 21 insertions, 1 deletions
@@ -1,4 +1,4 @@ -# m4.m4 serial 6 +# m4.m4 serial 7 # Copyright (C) 2000, 2006, 2007, 2008, 2009 Free Software Foundation, # Inc. @@ -20,6 +20,8 @@ AC_DEFUN([AC_PROG_GNU_M4], program of `m4', `gm4', or `gnum4' on PATH that meets Autoconf needs.]) AC_CACHE_CHECK([for GNU M4 that supports accurate traces], [ac_cv_path_M4], [rm -f conftest.m4f +ac_had_posixly_correct=${POSIXLY_CORRECT:+yes} +AS_UNSET([POSIXLY_CORRECT]) AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4 gnum4], [dnl Creative quoting here to avoid raw dnl and ifdef in configure. # Root out GNU M4 1.4.4, as well as non-GNU m4 that ignore -t, -F. @@ -32,6 +34,24 @@ AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4 gnum4], [AC_MSG_ERROR([no acceptable m4 could be found in \$PATH. GNU M4 1.4.5 or later is required; 1.4.11 is recommended])])]) M4=$ac_cv_path_M4 + AC_CACHE_CHECK([whether $ac_cv_path_M4 accepts -g], [ac_cv_prog_gnu_m4_gnu], + [case `$M4 --help < /dev/null 2>&1` in + *--gnu*) ac_cv_prog_gnu_m4_gnu=yes ;; + *) ac_cv_prog_gnu_m4_gnu=no ;; + esac]) + if test "$ac_cv_prog_gnu_m4_gnu" = yes; then + M4_GNU=-g + else + M4_GNU= + fi + AC_SUBST([M4_GNU]) + if test x$ac_had_posixly_correct = xyes; then + POSIXLY_CORRECT=: + if test $ac_cv_prog_gnu_m4_gnu = no; then + AC_MSG_WARN([The version of M4 that was found does not support -g.]) + AC_MSG_WARN([Using it with POSIXLY_CORRECT set may cause problems.]) + fi + fi 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 ;; |