diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-03 08:45:10 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-03 08:46:11 -0800 |
| commit | f1fe3fcfc568c1527714ff3a95e678816e2787d4 (patch) | |
| tree | bfe4792f57ae62222ba05b3c4d69706f3e83b212 /m4 | |
| parent | aaf86f30f709b22e9bae8cdb23ec89342dcaa55f (diff) | |
| download | emacs-f1fe3fcfc568c1527714ff3a95e678816e2787d4.tar.gz | |
Merge from gnulib
This incorporates:
2017-02-25 maintainer-makefile: Fix AC_PROG_SED with autoconf cache.
2017-02-24 ftoastr: port to -Wdouble-promotion
* lib/ftoastr.c, m4/gnulib-common.m4: Copy from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gnulib-common.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index 7d9b40b79b8..7b957f8a59d 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,4 +1,4 @@ -# gnulib-common.m4 serial 36 +# gnulib-common.m4 serial 37 dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -456,7 +456,9 @@ m4_ifndef([AC_PROG_SED], else ac_cv_path_SED=$SED fi + ]) SED="$ac_cv_path_SED" AC_SUBST([SED])dnl rm -f conftest.sed -])])]) +]) +]) |