From 989529926b0e34126c50f128f4049361c2541eec Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 4 Mar 2013 18:19:02 +0900 Subject: [PATCH] autopoint: extract macro directories from configure.ac --- gettext-tools/misc/ChangeLog | 6 ++++++ gettext-tools/misc/autopoint.in | 16 +++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog index 056921f9e..9a9aac19e 100644 --- a/gettext-tools/misc/ChangeLog +++ b/gettext-tools/misc/ChangeLog @@ -1,3 +1,9 @@ +2013-03-04 Daiki Ueno + + * autopoint.in: Handle macro directories specified in configure.ac. + Reported by Pavel Raiskup in + . + 2013-03-04 Daiki Ueno * gettextize.in: Use autoconf trace to detect auxdir and m4dir. diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in index d0725bc75..745fdb4f3 100644 --- a/gettext-tools/misc/autopoint.in +++ b/gettext-tools/misc/autopoint.in @@ -30,6 +30,8 @@ prefix="@prefix@" datarootdir="@datarootdir@" gettext_dir="@datadir@/gettext" +autom4te="autom4te --no-cache --language=Autoconf-without-aclocal-m4" + # func_tmpdir # creates a temporary directory. # Sets variable @@ -302,14 +304,22 @@ case "$ver" in esac # Check in which directory config.rpath, mkinstalldirs etc. belong. -auxdir=`cat "$configure_in" | grep '^AC_CONFIG_AUX_DIR' | sed -n -e 's/AC_CONFIG_AUX_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` +auxdir=`$autom4te --trace=AC_CONFIG_AUX_DIR:\$% "$configure_in"` if test -n "$auxdir"; then auxdir="$auxdir/" fi # Check in which directory the *.m4 macros belong. -m4dir=m4 -if test -f Makefile.am; then +macrodirs=`$autom4te --trace=AC_CONFIG_MACRO_DIR_TRACE:\$% "$configure_in"` +if test -z "$macrodirs"; then + macrodirs=`$autom4te --trace=AC_CONFIG_MACRO_DIR:\$% "$configure_in"` +fi +for arg in $macrodirs; do + m4dir="$arg" + break +done + +if test -z "$m4dir" && test -f Makefile.am; then # A package using automake. # Extract the macro directory name from Makefile.am. aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ ]*=' Makefile.am | sed -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/'` -- 2.47.2