[Libvir] 1/22 Pull in more Gnulib modules

[Jim Meyering]

Jim Meyering <jim at meyering.net> wrote:

> "Richard W.M. Jones" <rjones at redhat.com> wrote:
>> (However the documentation for physmem says the module is under
>> LGPLv2+ so either the documentation is wrong or the top of the file is
>> wrong or else I don't understand what's going on here).
>>
>> Unfortunately although all the modules above are LGPLv2, I just
>> noticed that getpass depends indirectly on realloc.  Documentation for
>> realloc says its LGPLv2+ so I didn't think it was a problem, but the
>> top of the file says LGPLv3.
>
> Using gnulib-tools' --lgpl=2 option fixes this.
> That will cause the copyright notices to be rewritten.
> However, that currently excludes *all* of the unit tests, because
> these tests rely on LGPLv3 modules.  So the easiest solution
> (though it's unfortunate for both libvirt and gnulib) is to give
> up those unit tests: i.e., to remove the --with-tests option below.
> And without the tests, there's no need for the three --avoid= options:
>
> diff --git a/bootstrap b/bootstrap
> index 73ad3f6..474f4a8 100755
> --- a/bootstrap
> +++ b/bootstrap

FYI, 
The new bootstrap script will end with:

...
gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
<$gnulib_tool || exit

# Tell gnulib to:
#   require LGPLv2+
#   put *.m4 files in new gnulib/m4/ dir
#   put *.[ch] files in new gnulib/lib/ dir.

$gnulib_tool			\
  --lgpl=2			\
  --m4-base=gnulib/m4		\
  --source-base=gnulib/lib	\
  --import physmem getaddrinfo

rm -f				\
    .gitignore			\
    gnulib/lib/.gitignore	\
    gnulib/m4/.gitignore	\
    gnulib/tests/.gitignore

(cd gnulib/lib &&
 (cat .cvsignore; \
  ls -1 *.in.h|sed 's/\.in\.h/.h/') | sort -u > .t; mv .t .cvsignore)