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>.

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index d1432936f7ba6ca7c5aa6bb6cae96830b6c60f02..336d4545171f8c4e01c2685025f00f2906556fbc 100644 (file)
--- 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 d8c7d747a952f4c7a63781e6f3faf548f87bc015..0de13223f6336e17075c64ad452959cef231d1c4 100644 (file)
--- 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 9b0b465270738f995c6d07882307d0340500d37e..063b57ba8f5c4fe9355c3021f16afcac9391639a 100644 (file)
--- 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], [])