Re: [Bug-wget] WARC, new version

[Giuseppe Scrivano]

Gijs van Tulder <address@hidden> writes:

> === modified file 'bootstrap.conf'
> --- bootstrap.conf    2011-08-11 12:23:39 +0000
> +++ bootstrap.conf    2011-10-21 19:24:18 +0000
> @@ -28,6 +28,7 @@
>  accept
>  alloca
>  announce-gen
> +base32
>  bind
>  c-ctype
>  clock-time
> @@ -49,6 +50,7 @@
>  mbtowc
>  mkdir
>  crypto/md5
> +crypto/sha1
>  pipe
>  quote
>  quotearg
> @@ -63,6 +65,7 @@
>  stdbool
>  strcasestr
>  strerror_r-posix
> +tmpdir
>  unlocked-io
>  update-copyright
>  vasprintf
>
> === modified file 'configure.ac'
> --- configure.ac      2011-09-04 12:19:12 +0000
> +++ configure.ac      2011-10-23 21:21:49 +0000
> @@ -511,7 +511,22 @@
>    fi
>  fi
>  
> -
> +# Warc
> +AC_CHECK_HEADER(uuid/uuid.h, UUID_FOUND="yes", UUID_FOUND="no")
> +if test x$UUID_FOUND = xno; then
> +  AC_MSG_ERROR([libuuid is required])
> +fi
> +
> +AC_CHECK_LIB(uuid, uuid_generate, UUID_FOUND="yes", UUID_FOUND="no")
> +if test x$UUID_FOUND = xno; then
> +  AC_MSG_ERROR([libuuid is required])
> +fi
> +LIBUUID="-luuid"
> +AC_SUBST(LIBUUID)
> +LDFLAGS="${LDFLAGS} -L$libuuid/lib"
> +CPPFLAGS="${CPPFLAGS} -I$libuuid/include"

I think we shouldn't change the value of LDFLAGS and CPPFLAGS as they
are user variables.  Also, where is $libuuid defined?  We can just drop
these lines.



>    if (hs->res >= 0)
>      CLOSE_FINISH (sock);
>    else
> -    {
> -      if (hs->res < 0)
> -        hs->rderrmsg = xstrdup (fd_errstr (sock));
> -      CLOSE_INVALIDATE (sock);
> -    }
> +    CLOSE_INVALIDATE (sock);

Why?


The rest seems ok, if you also provide a ChangeLog I can proceed to
merge it.

Thanks,
Giuseppe