Re: Accommodate non-recursive Automake in a less hacky way

2021-12-19 Thread Bruno Haible
Jim Meyering wrote: > I want to switch every package for which I used the hacky way. > Hoping we can remove the 'non-recursive-gnulib-prefix-hack' support > code before too long. coreutils and bison have switched already. Therefore I'm now deprecating the module: 2021-12-19 Bruno Haible

Re: Accommodate non-recursive Automake in a less hacky way

2021-12-18 Thread Bruno Haible
Another fix is needed, for the 'libtextstyle-optional' module. Uncovered by the continuous integration. 2021-12-18 Bruno Haible libtextstyle-optional: Fix generation of textstyle.h (regr. 2021-12-15). * m4/libtextstyle-optional.m4 (gl_LIBTEXTSTYLE_OPTIONAL): Invoke

Re: Accommodate non-recursive Automake in a less hacky way

2021-12-18 Thread Bruno Haible
The first patch handled option --gnu-make in lib/Makefile.in but not in tests/Makefile.in. Fixed as follows: 2021-12-18 Bruno Haible Fix support for --gnu-make in tests (regression 2021-12-15). * gnulib-tool (func_emit_tests_Makefile_am): When producing output for GNU

Re: Accommodate non-recursive Automake in a less hacky way

2021-12-17 Thread Bruno Haible
Paul Eggert wrote: > Unless I'm missing something, the "Move .h file names out of the *.m4 > files" patch omitted an "if GL_GENERATE_GEOPT_H" in getopt-posix. I > installed the attached to finish this part up. This was not a regression. The Automake conditional was in fact not used, since the

Re: Accommodate non-recursive Automake in a less hacky way

2021-12-17 Thread Bruno Haible
These patches contained a mistake regarding module 'getopt-posix': On AIX I get a build failure source='../../../getopt-posix/gllib/unistd.c' object='unistd.o' libtool=no DEPDIR=.deps depmode=xlc /bin/sh ../../../getopt-posix/build-aux/depcomp xlc -q64 -qthreaded -qtls -DHAVE_CONFIG_H -I.

Re: Accommodate non-recursive Automake in a less hacky way

2021-12-16 Thread Paul Eggert
Unless I'm missing something, the "Move .h file names out of the *.m4 files" patch omitted an "if GL_GENERATE_GEOPT_H" in getopt-posix. I installed the attached to finish this part up. Please feel free to revert if I messed up.diff --git a/ChangeLog b/ChangeLog index e1be947a3..6fee602cc 100644

Re: Accommodate non-recursive Automake in a less hacky way

2021-12-16 Thread Paul Eggert
On 12/16/21 03:42, Bruno Haible wrote: Jim Meyering wrote: I want to switch every package for which I used the hacky way. This patch is all you need for coreutils. Thanks, I installed that.

Re: Accommodate non-recursive Automake in a less hacky way

2021-12-16 Thread Bruno Haible
Jim Meyering wrote: > I want to switch every package for which I used the hacky way. This patch is all you need for coreutils. Bruno diff --git a/bootstrap.conf b/bootstrap.conf index 2b66bc42d..c2f74f406 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -182,7 +182,6 @@ gnulib_modules="

Re: Accommodate non-recursive Automake in a less hacky way

2021-12-16 Thread Bruno Haible
Two additional patches in this area: 2021-12-15 Bruno Haible automake-subdir support: Support the libunistring modules. * m4/libunistring-base.m4 (gl_LIBUNISTRING_LIBHEADER): Use the value of the gl_source_base_prefix variable. 2021-12-15 Bruno Haible

Re: Accommodate non-recursive Automake in a less hacky way

2021-12-15 Thread Bruno Haible
Jim Meyering wrote: > Thanks a lot! The core of the processing is still the build-aux/prefix-gnulib-mk that you wrote. I dared to document it and thus declare it "supported", because if people encounter problems with specific modules, we can fix them - either by recognizing more patterns in

Re: Accommodate non-recursive Automake in a less hacky way

2021-12-15 Thread Jim Meyering
On Wed, Dec 15, 2021 at 11:38 AM Ben Pfaff wrote: > On Wed, Dec 15, 2021 at 11:31 AM Bruno Haible wrote: > > With the attached patches, 'gnulib-tool' gains the functionality to > > generate a "non-recursive" Automake Makefile.am snippet, similar to > > what the 'non-recursive-gnulib-prefix-hack'

Re: Accommodate non-recursive Automake in a less hacky way

2021-12-15 Thread Ben Pfaff
On Wed, Dec 15, 2021 at 11:31 AM Bruno Haible wrote: > With the attached patches, 'gnulib-tool' gains the functionality to > generate a "non-recursive" Automake Makefile.am snippet, similar to > what the 'non-recursive-gnulib-prefix-hack' module does. Thank you! I favor nonrecursive Makefiles