summaryrefslogtreecommitdiff
path: root/m4/m4.m4
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2009-07-13 21:34:49 -0600
committerEric Blake <ebb9@byu.net>2009-07-13 21:59:47 -0600
commitc633d4a39a0385a3534ab154390943d5de50b3ff (patch)
treecac49377cce15d37d1d61b3b5f4cc0dcc4ca0da7 /m4/m4.m4
parentac0fd199f9027786bc4bb332f9f4116e8b1ffccf (diff)
downloadautoconf-c633d4a39a0385a3534ab154390943d5de50b3ff.tar.gz
Fix nits in recent patches.
* configure.ac (ac_cv_dir_trailing_space): Avoid $status, for zsh. * doc/autoconf.texi (Writing Testsuites) <AT_FAIL_IF, AT_SKIP_IF>: Tweak wording. (Introduction): Recommend m4 1.4.13. * README: Likewise. * m4/m4.m4 (AC_PROG_GNU_M4): Likewise. Use long option --gnu rather than -g. Signed-off-by: Eric Blake <ebb9@byu.net>
Diffstat (limited to 'm4/m4.m4')
-rw-r--r--m4/m4.m49
1 files changed, 5 insertions, 4 deletions
diff --git a/m4/m4.m4 b/m4/m4.m4
index 975f24a8..d637e926 100644
--- a/m4/m4.m4
+++ b/m4/m4.m4
@@ -1,4 +1,4 @@
-# m4.m4 serial 7
+# m4.m4 serial 8
# Copyright (C) 2000, 2006, 2007, 2008, 2009 Free Software Foundation,
# Inc.
@@ -32,15 +32,16 @@ AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4 gnum4],
&& ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
rm -f conftest.m4f],
[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])])])
+GNU M4 1.4.5 or later is required; 1.4.13 is recommended])])])
M4=$ac_cv_path_M4
- AC_CACHE_CHECK([whether $ac_cv_path_M4 accepts -g], [ac_cv_prog_gnu_m4_gnu],
+ AC_CACHE_CHECK([whether $ac_cv_path_M4 accepts --gnu],
+ [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
+ M4_GNU=--gnu
else
M4_GNU=
fi