From: Daiki Ueno <ueno@gnu.org>
Date: Tue, 19 Nov 2013 03:08:10 +0000 (+0900)
Subject: autopoint: disable m4_include and m4_esyscmd when tracing
X-Git-Tag: v0.18.3.2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19767d4ab9ed8c728bc29e5b93bf8a9ddd56ced2;p=thirdparty%2Fgettext.git

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 d1432936f..336d45451 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 d8c7d747a..0de13223f 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 9b0b46527..063b57ba8 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], [])