Jim Meyering <j...@meyering.net> wrote:
> Jim Meyering <j...@meyering.net> wrote:
>> FYI, now I'm looking at the changes induced by the following:
>>
>> git ls-files | grep '\.m4$' | xargs perl -pi \
>> -e 's/(AC_[A-Z_]+\()([^[()]+?)([,)])/$1\[$2]$3/g;' \
>> -e 's/(AC_[A-Z_]+\((?:\[[^,]+?\], ){1})([^,[()]+?)([,)])/$1\[$2]$3/g;' \
>> -e 's/(AC_[A-Z_]+\((?:\[[^,]+?\], ){2})([^,[()]+?)([,)])/$1\[$2]$3/g;' \
>> -e 's/(AC_[A-Z_]+\((?:\[[^,]+?\], ){3})([^,[()]+?)([,)])/$1\[$2]$3/g'
>> # [note that the above is not equivalent to using {0,3} ]
>>
>> # This is the sole unwanted change (to onceonly.m4):
>> # -# AC_CHECK_DECLS([DECL1], [DECL2], ...).
>> # +# AC_CHECK_DECLS([DECL1], [DECL2], [...]).
>>
>> # Undo it:
>> perl -pi -e 's/\[\.\.\.\]/.../' m4/onceonly.m4
>>
>>
>> FYI, adding the 4-arg transform induced only two new changes,
>> both in comments:
>>
>> +# _AC_FUNC_FNMATCH_IF([STANDARD = GNU | POSIX], [CACHE_VAR], [IF-TRUE],
>> [IF-FALSE])
>> +dnl AC_LIB_HAVE_LINKFLAGS([name], [dependencies], [includes], [testcode])
>
> I'm about to apply the changes induced by the above commands.
> I ran all tests on an Fedora 10 system, like this:
>
> ./gnulib-tool --create-testdir --with-tests --dir=/tmp/testdir
> ./configure CFLAGS='-O -g -Wformat -Wformat-security \
> -Winit-self -Wall -Wpointer-arith -Wshadow -Wcast-align
> -Wwrite-strings -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -Dlint' \
> && make && make check
>
> There was only one unrelated failure, due to test-copy-file.
> More details below.
>
> I also tested it through coreutils builds, and cross-checked its
> before/after changes induced in these files: configure config.status
> config.log lib/config.h{,in} aclocal.m4
>
> I'll push this change today, so speak now if you don't like some part
> of it. [BTW, no .m4 file is listed in config/srclist.txt, so I didn't
> even try to exclude any that might belong to some other project. ]
Bruno,
Many files with a serial number line mentioning gettext are effected:
$ git log -1 --name-only --pretty=oneline \
|tail -n+2|xargs grep -l 'serial.*gettext-'
m4/codeset.m4
m4/csharp.m4
m4/csharpexec.m4
m4/eaccess.m4
m4/gettext.m4
m4/iconv.m4
m4/intl.m4
m4/intldir.m4
m4/intlmacosx.m4
m4/intmax.m4
m4/inttypes-pri.m4
m4/javaexec.m4
m4/lcmessage.m4
m4/lib-ld.m4
m4/lib-link.m4
m4/lock.m4
m4/nls.m4
m4/po.m4
m4/printf-posix.m4
m4/progtest.m4
m4/sig_atomic_t.m4
m4/threadlib.m4
m4/tmpdir.m4
m4/wchar_t.m4
m4/wint_t.m4
Would you prefer that I not modify those files?
