moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

gnutls: fix build under mingw32.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2010-10-23 13:50:31 +02:00
parent b38c40b34e
commit 8405493e1d
6 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2010-10-23 Giuseppe Scrivano <gscrivano@gnu.org>
* configure.ac: Add check for libgpg-error and libgcrypt.
2010-09-06 Giuseppe Scrivano <gscrivano@gnu.org>
* lib/Makefile.am: Fix typo.

10
configure.ac
View File

@ -263,10 +263,12 @@ AS_IF([test x"$with_ssl" = xopenssl], [
# --with-ssl is not gnutls: check if it's no
AS_IF([test x"$with_ssl" != xno], [
dnl Now actually check for -lssl
AC_LIB_HAVE_LINKFLAGS([gnutls], [], [
#include <gnutls/gnutls.h>
], [gnutls_global_init()])
if test x"$LIBGNUTLS" != x
AC_CHECK_LIB(gpg-error, gpg_err_init)
AC_CHECK_LIB(gcrypt, gcry_control)
AC_CHECK_LIB(gnutls, main)
if test x"$ac_cv_lib_gnutls_main" != x
then
AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
AC_LIBOBJ([gnutls])

3
src/ChangeLog
View File

@ -1,5 +1,8 @@
2010-10-23 Giuseppe Scrivano <gscrivano@gnu.org>
* Makefile.am (LIBS): Remove @LIBGNUTLS@ and use @W32LIBS@ as last
component.
* gnutls.c (wgnutls_peek): Block until data is available.
2010-10-21 Giuseppe Scrivano <gscrivano@gnu.org>

2
src/Makefile.am
View File

@ -37,7 +37,7 @@ endif
# The following line is losing on some versions of make!
DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
LIBS = @LIBSSL@ @LIBGNUTLS@ @LIBICONV@ @LIBINTL@ @W32LIBS@ @LIBS@
LIBS = @LIBSSL@ @LIBICONV@ @LIBINTL@ @LIBS@ @W32LIBS@
bin_PROGRAMS = wget
wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c \

5
tests/ChangeLog
View File

@ -1,3 +1,8 @@
2010-10-23 Giuseppe Scrivano <gscrivano@gnu.org>
* Makefile.am (LIBS): Remove @LIBGNUTLS@ and use @W32LIBS@ as last
component.
2010-09-12 Mike Frysinger <vapier@gentoo.org>
Fix some tests failures.

2
tests/Makefile.am
View File

@ -34,7 +34,7 @@
PERL = perl
PERLRUN = $(PERL) -I$(srcdir)
LIBS = @LIBSSL@ @LIBGNUTLS@ @LIBICONV@ @LIBINTL@ @W32LIBS@ @LIBS@
LIBS = @LIBSSL@ @LIBICONV@ @LIBINTL@ @LIBS@ @W32LIBS@
.PHONY: test run-unit-tests run-px-tests