autopoint: recognize multiple arguments of AM_GNU_GETTEXT when tracing

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index ea9134c2a379401e0012a0e5ac7817fd70d573d7..635251855dd6c72cad0ec3f22bcaae588f55ea63 100644 (file)
--- 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 51f85511bf5c27a8852a2e1dd935c8b2ae08efce..2c0356261c3e021d859c37ebfe28984c5630c41f 100644 (file)
--- 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 6278a3d907cf0eca653c9679b37478b21450a717..be837b9c9a30a57bba4bca74fc431b634fc63f16 100644 (file)
--- 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