From: Daiki Ueno <ueno@gnu.org>
Date: Thu, 5 Dec 2013 09:47:46 +0000 (+0900)
Subject: autopoint: Allow user to specify custom autom4te executable
X-Git-Tag: v0.18.3.2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cbe8e4753fb973fd9aa4ac4cb7fb802ef3ad7df;p=thirdparty%2Fgettext.git

autopoint: Allow user to specify custom autom4te executable

* autopoint.in (func_trace): Allow user to specify autom4te
executable name through $AUTOM4TE envvar.
* gettextize.in (func_trace): Likewise.
Suggested by Eric Blake at
<https://lists.gnu.org/archive/html/bug-gettext/2013-12/msg00006.html>.
---

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 336d45451..12dedef15 100644
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,11 @@
+2013-12-05  Daiki Ueno  <ueno@gnu.org>
+
+	* autopoint.in (func_trace): Allow user to specify autom4te
+	executable name through $AUTOM4TE envvar.
+	* gettextize.in (func_trace): Likewise.
+	Suggested by Eric Blake at
+	<https://lists.gnu.org/archive/html/bug-gettext/2013-12/msg00006.html>.
+
 2013-11-19  Daiki Ueno  <ueno@gnu.org>
 
 	* autopoint.in (func_trace): Disable m4_include and m4_esyscmd.
diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index 0de13223f..3b664177b 100644
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -153,7 +153,7 @@ dnl macros which needs to be traced without aclocal.m4
 m4_define([AM_GNU_GETTEXT], [])
 m4_define([AM_GNU_GETTEXT_VERSION], [])
 ' \
-  | autom4te --no-cache --language=Autoconf-without-aclocal-m4 \
+  | ${AUTOM4TE:-autom4te} --no-cache --language=Autoconf-without-aclocal-m4 \
     --trace="$1":\$% - "$2" 2>/dev/null
 }
 
diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 063b57ba8..9abbf354e 100644
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -153,7 +153,7 @@ dnl macros which needs to be traced without aclocal.m4
 m4_define([AM_GNU_GETTEXT], [])
 m4_define([AM_GNU_GETTEXT_VERSION], [])
 ' \
-  | autom4te --no-cache --language=Autoconf-without-aclocal-m4 \
+  | ${AUTOM4TE:-autom4te} --no-cache --language=Autoconf-without-aclocal-m4 \
     --trace="$1":\$% - "$2" 2>/dev/null
 }