autopoint: use 'm4' as the fallback macro directory

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index bc11572787a48c08f9913580fd87bab9b04890ac..d1432936f7ba6ca7c5aa6bb6cae96830b6c60f02 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-16  Daiki Ueno  <ueno@gnu.org>
+
+       * autopoint.in: Use 'm4' as the default macro directory if it is
+       not specified in configure.ac nor Makefile.am.
+       Reported by Michał Górny in
+       <http://savannah.gnu.org/bugs/?40278>.
+
 2013-09-24  Daiki Ueno  <ueno@gnu.org>
 
        * autopoint.in (func_trace): Discard stderr of autom4te.

diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index 72b268b35edc4edfedef89c7877f018671254d2d..d8c7d747a952f4c7a63781e6f3faf548f87bc015 100644 (file)
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -347,6 +347,10 @@ if test -z "$m4dir" && test -f Makefile.am; then
   done
 fi
 
+if test -z "$m4dir"; then
+  m4dir=m4
+fi
+
 # Check whether to omit the intl/ directory.
 omitintl=
 xargs=`func_trace AM_GNU_GETTEXT "$configure_in"`