[PATCH] gnulib-tool.py: Follow gnulib-tool changes, part 52.

[Collin Funk]

On 3/9/24 6:28 PM, Collin Funk wrote:
> I think that should be a pretty easy change so I will try to get it
> done sometime today.

Not the cleanest code I have ever written but it seems to work. :)

Here is a test case:

gnulib-tool.py --create-testdir --dir test-python dummy
gnulib-tool --create-testdir --dir test-shell dummy
# Copied from Coreutils configure.ac
sed -i -e 's/AM_INIT_AUTOMAKE/AM_INIT_AUTOMAKE([1.11.2 dist-xz color-tests 
parallel-tests subdir-objects])/g' test-python/configure.ac 
test-shell/configure.ac
(cd test-python && gnulib-tool.py --import --automake-subdir --with-tests 
alloca-opt alloca)
(cd test-shell && gnulib-tool --import --automake-subdir --with-tests 
alloca-opt alloca)
git diff --no-index test-python test-shell

Now gnulib-tool.py will see subdir-objects in Coreutil's configure.ac.
It still fails to bootstrap because of the @NMD@ magic:

autoreconf: running: automake --add-missing --copy --force-missing
lib/gnulib.mk:2011: error: bad characters in variable name '@!NMD@gl_V_at'
Makefile.am:212:   'lib/local.mk' included from here
lib/local.mk:1:   'lib/gnulib.mk' included from here
gnulib-tests/gnulib.mk:1384: error: bad characters in variable name 
'@!NMD@gl_V_at'
gnulib-tests/Makefile.am:1:   'gnulib-tests/gnulib.mk' included from here
autoreconf: error: automake failed with exit status: 1
./bootstrap: autoreconf failed

I don't remember those changes looking too hard, so _hopefully_ I can
get them done soon.

Collin

0002-gnulib-tool.py-Follow-gnulib-tool-changes-part-52.patch
Description: Text Data