autopoint: extract macro directories from configure.ac

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 056921f9e6ec42d15f91889670d9c4b59425cbbc..9a9aac19ed28f340aa5b83739bd131fdf30e1b01 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-04  Daiki Ueno  <ueno@gnu.org>
+
+       * autopoint.in: Handle macro directories specified in configure.ac.
+       Reported by Pavel Raiskup in
+       <http://lists.gnu.org/archive/html/bug-gettext/2013-02/msg00017.html>.
+
 2013-03-04  Daiki Ueno  <ueno@gnu.org>
 
        * 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 d0725bc75241f66bb775f59e667f82d714a6faee..745fdb4f33e5d3482a4e4d7211bce40dd0cc0eb8 100644 (file)
--- 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/'`