From: Daiki Ueno Date: Wed, 16 Oct 2013 07:34:48 +0000 (+0900) Subject: autopoint: use 'm4' as the fallback macro directory X-Git-Tag: v0.18.3.2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6d1e2ba5ea02778b3e1c82e177ffee9ad3766f4;p=thirdparty%2Fgettext.git autopoint: use 'm4' as the fallback macro directory --- diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog index bc1157278..d1432936f 100644 --- a/gettext-tools/misc/ChangeLog +++ b/gettext-tools/misc/ChangeLog @@ -1,3 +1,10 @@ +2013-10-16 Daiki Ueno + + * 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 + . + 2013-09-24 Daiki Ueno * autopoint.in (func_trace): Discard stderr of autom4te. diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in index 72b268b35..d8c7d747a 100644 --- 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"`