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 336d4545171f8c4e01c2685025f00f2906556fbc..12dedef153d971b77df5cfaf5312b0b064afde46 100644 (file)
--- 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 0de13223f6336e17075c64ad452959cef231d1c4..3b664177bba9aaae85b5a964a1802c75eaef0482 100644 (file)
--- 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 063b57ba8f5c4fe9355c3021f16afcac9391639a..9abbf354e9285cd62c23c2a53dd4a642a0c99d47 100644 (file)
--- 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
 }