Re: [Bug-wget] [patch] uuid generation in warc.c

[Tim Ruehsen]

On Tuesday 16 December 2014 13:47:36 Jérémie Courrèges-Anglas wrote:
> Tim Ruehsen <address@hidden> writes:
> > On Tuesday 16 December 2014 00:26:35 Jérémie Courrèges-Anglas wrote:
> >> Hi,
> >>
> >> in src/warc.c three methods are provided to generate uuids: libuuid,
> >> uuid functions from libc, and a fallback method.  At least OpenBSD,
> >> FreeBSD and NetBSD provide those uuid functions in their libc.
> >>
> >>   http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/uuid.3
> >>
> >> This diff fixes the detection and use of those functions.  It does not
> >> change the fact that libuuid is always preferred if present and not
> >> explicitely disabled.
> >
> > Thanks for your contribution !
>
> Thanks for looking at it!
>
> > It looks like a good opportunity to fix ./configure's libuuid detection.
> >
> > We just have to agree on an approach.
> > Suggestion:
> > if --with-libuuid explicitly specified
> >
> >   search for libuuid (pkg-config or fallback to AC_SEARCH_LIBS)
> >   if not found print error and stop
> >
> > else
> >
> >   search for uuid_create (AC_CHECK_FUNC)
> >   if not found
> >
> >     if --without-libuuid explicitly specified
> >
> >       use fallback code
> >
> >     else
> >
> >       search for libuuid (pkg-config or fallback to AC_SEARCH_LIBS)
> >       if not found
> >
> >         use fallback code
>
> I think this makes sense and would be a nice addition on any OS that
> provides those uuid functions natively.
>
> > What do you think ?
> > Would you like to amend your patch or should I do it ?
>
> Given the following points:
> - I didn't sign the FSF paperwork thus I'm trying to submit minimal
>   diffs only
> - this first patch allows me to keep libuuid disabled in the OpenBSD
>   port and yet use the features provided by libc
> - this first patch only attempts to correct the handling of uuid.h /
>   uuid_create (not libuuid),
> my opinion is that your proposal ought to be implemented in an
> additional patch.  I'm interested in reviewing such a patch.

Thanks, your patch has been pushed to git.

On top of it I created the attached patch that implements my suggestion from
above.
Please review and test on OpenBSD if possible.

Tim

0001-configure.ac-Fix-libuuid-and-uuid_create-detection.patch
Description: Text Data

signature.asc
Description: This is a digitally signed message part.