summaryrefslogtreecommitdiffstats
path: root/gettext-tools/misc
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2013-09-24 12:51:16 +0900
committerDaiki Ueno <ueno@gnu.org>2013-09-24 12:51:16 +0900
commitc97f0cb8c7be54b99d62a571208e393da0a5de89 (patch)
treecc4a05511f19257c9b7e1b07eb8f6f1a95467815 /gettext-tools/misc
parent8a3e982f9dec5dab5fee0745018211a863a41ea8 (diff)
downloadexternal_gettext-c97f0cb8c7be54b99d62a571208e393da0a5de89.zip
external_gettext-c97f0cb8c7be54b99d62a571208e393da0a5de89.tar.gz
external_gettext-c97f0cb8c7be54b99d62a571208e393da0a5de89.tar.bz2
autopoint: recognize multiple arguments of AM_GNU_GETTEXT when tracing
Diffstat (limited to 'gettext-tools/misc')
-rw-r--r--gettext-tools/misc/ChangeLog8
-rw-r--r--gettext-tools/misc/autopoint.in2
-rw-r--r--gettext-tools/misc/gettextize.in2
3 files changed, 12 insertions, 0 deletions
diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index c6cd999..89ae650 100644
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,11 @@
+2013-09-24 Daiki Ueno <ueno@gnu.org>
+
+ * autopoint.in: Recognize multiple arguments of AM_GNU_GETTEXT
+ when tracing.
+ * gettextize.in: Likewise.
+ Reported by Gary V. Vaughan in
+ <http://savannah.gnu.org/bugs/?40082>.
+
2013-08-12 Daiki Ueno <ueno@gnu.org>
autopoint: make macro trace in autom4te robuster
diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index 51f8551..2c03562 100644
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -350,12 +350,14 @@ fi
# Check whether to omit the intl/ directory.
omitintl=
xargs=`func_trace AM_GNU_GETTEXT "$configure_in"`
+save_IFS="$IFS"; IFS=:
for arg in $xargs; do
if test 'external' = "$arg"; then
omitintl=yes
break
fi
done
+IFS="$save_IFS"
# Check in which directory or directories the po/* infrastructure belongs.
configfiles=`func_trace AC_CONFIG_FILES "$configure_in"`
diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index 6278a3d..be837b9 100644
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -675,12 +675,14 @@ else
# Tell the user what to put into configure.ac, if it is not already there.
external=
xargs=`func_trace AM_GNU_GETTEXT "$srcdir/$configure_in"`
+ save_IFS="$IFS"; IFS=:
for arg in $xargs; do
if test 'external' = "$arg"; then
external=yes
break
fi
done
+ IFS="$save_IFS"
if test -z "$external"; then
please="$please
Please use AM_GNU_GETTEXT([external]) in order to cause autoconfiguration