From: Daiki Ueno <ueno@gnu.org>
Date: Mon, 4 Mar 2013 09:30:36 +0000 (+0900)
Subject: gettextize: Use autoconf trace to detect auxdir and m4dir
X-Git-Tag: v0.18.3~75^2~5
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e9fe70eeb12b4a3d5e306a55bf22f8fcccb9a8cd;p=thirdparty%2Fgettext.git

gettextize: Use autoconf trace to detect auxdir and m4dir
---

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 92dbd8d31..056921f9e 100644
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-04  Daiki Ueno  <ueno@gnu.org>
+
+	* gettextize.in: Use autoconf trace to detect auxdir and m4dir.
+
 2013-03-04  Daiki Ueno  <ueno@gnu.org>
 
 	* gettextize.in: Don't add redundant "-I m4" if
diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index f44a1c2e1..319543cbd 100644
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.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
@@ -309,13 +311,16 @@ if test $force -eq 0; then
 fi
 
 # Check in which directory config.rpath 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 gettext.m4 etc. belong.
-macrodirs=`cat "$configure_in" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIRS\{,1\}(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/'`
+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