"GNULIB_STRERROR" redefined in single-configure package

[Daiki Ueno]

Hello,

In GnuTLS, we import Gnulib sources in two phases, first LGPL sources to
be linked with the library, and then GPL sources for the tools and
tests, something like following:

In bootstrap:

  gnulib-tool --extract-recursive-dependencies "$gnulib_modules"
  gnulib-tool --import --local-dir=src/gl/override --lib=libgnu_gpl 
--source-base=src/gl --m4-base=src/gl/m4 --doc-base=doc --aux-dir=build-aux 
--no-conditional-dependencies --libtool --macro-prefix=ggl --without-tests 
--no-vc-files "$src_modules"

In configure.ac:

  gl_INIT
  ggl_INIT

It had worked until we added 'xalloc' to $src_modules, but now,
confdefs.h generated during the configure phase contains two definitions
of GNULIB_STRERROR and it prevents compilation with -Werror:

  configure:53786: gcc -o conftest -O0 -Wall -Werror -g3   conftest.c  -lev >&5
  conftest.c:412: error: "GNULIB_STRERROR" redefined [-Werror]
    412 | #define GNULIB_STRERROR 1
        | 
  conftest.c:305: note: this is the location of the previous definition
    305 | #define GNULIB_STRERROR IN_GNUTLS_GNULIB_TESTS
        | 
  cc1: all warnings being treated as errors

Could anyone shed some light on this?

Regards,
-- 
Daiki Ueno