diff options
| author | Daiki Ueno <ueno@gnu.org> | 2013-11-19 12:08:10 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2013-12-04 19:15:05 +0900 |
| commit | 4142e63b88032c25572fd50b6518dadcfeee2c15 (patch) | |
| tree | 5de8edbda245d722976e9e256891d73492cb7b0a /gettext-tools/misc | |
| parent | 82dae3e3a124a220dbfe9de6c46d1ddc9cb22498 (diff) | |
| download | external_gettext-4142e63b88032c25572fd50b6518dadcfeee2c15.zip external_gettext-4142e63b88032c25572fd50b6518dadcfeee2c15.tar.gz external_gettext-4142e63b88032c25572fd50b6518dadcfeee2c15.tar.bz2 | |
autopoint: disable m4_include and m4_esyscmd when tracing
* autopoint.in (func_trace): Disable m4_include and m4_esyscmd.
* gettextize.in (func_trace): Likewise.
Reported by Bernhard Voelker in
<https://lists.gnu.org/archive/html/bug-gettext/2013-11/msg00011.html>
and suggested by Eric Blake at <https://savannah.gnu.org/bugs/?40083>.
Diffstat (limited to 'gettext-tools/misc')
| -rw-r--r-- | gettext-tools/misc/ChangeLog | 8 | ||||
| -rw-r--r-- | gettext-tools/misc/autopoint.in | 4 | ||||
| -rw-r--r-- | gettext-tools/misc/gettextize.in | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog index 6ac8663..8ea62a1 100644 --- a/gettext-tools/misc/ChangeLog +++ b/gettext-tools/misc/ChangeLog @@ -1,3 +1,11 @@ +2013-11-19 Daiki Ueno <ueno@gnu.org> + + * autopoint.in (func_trace): Disable m4_include and m4_esyscmd. + * gettextize.in (func_trace): Likewise. + Reported by Bernhard Voelker + <https://lists.gnu.org/archive/html/bug-gettext/2013-11/msg00011.html> + and suggested by Eric Blake at <https://savannah.gnu.org/bugs/?40083>. + 2013-10-16 Daiki Ueno <ueno@gnu.org> * autopoint.in: Use 'm4' as the default macro directory if it is diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in index d8c7d74..0de1322 100644 --- a/gettext-tools/misc/autopoint.in +++ b/gettext-tools/misc/autopoint.in @@ -141,12 +141,14 @@ fi func_trace () { echo '\ -dnl ignore M4sugar macros which may abort autom4te +dnl disable macros which may abort autom4te m4_undefine([m4_assert]) m4_undefine([m4_fatal]) m4_undefine([m4_warn]) m4_undefine([m4_errprintn]) m4_undefine([m4_exit]) +m4_undefine([m4_include]) +m4_undefine([m4_esyscmd]) dnl macros which needs to be traced without aclocal.m4 m4_define([AM_GNU_GETTEXT], []) m4_define([AM_GNU_GETTEXT_VERSION], []) diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in index 9b0b465..063b57b 100644 --- a/gettext-tools/misc/gettextize.in +++ b/gettext-tools/misc/gettextize.in @@ -141,12 +141,14 @@ fi func_trace () { echo '\ -dnl ignore M4sugar macros which may abort autom4te +dnl disable macros which may abort autom4te m4_undefine([m4_assert]) m4_undefine([m4_fatal]) m4_undefine([m4_warn]) m4_undefine([m4_errprintn]) m4_undefine([m4_exit]) +m4_undefine([m4_include]) +m4_undefine([m4_esyscmd]) dnl macros which needs to be traced without aclocal.m4 m4_define([AM_GNU_GETTEXT], []) m4_define([AM_GNU_GETTEXT_VERSION], []) |