mirror/gettext
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gettext.git synced 2026-01-26 15:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

autopoint: extract macro directories from configure.ac

Browse Source
This commit is contained in:
Daiki Ueno 2013-03-04 18:19:02 +09:00
parent e9fe70eeb1
commit 989529926b
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gettext-tools/misc/ChangeLog
View File

@ -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.

16
gettext-tools/misc/autopoint.in
View File

@ -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/'`