gnutls: fix build under mingw32.

diff --git a/ChangeLog b/ChangeLog
index 147e1d622eed42d0864b396592eceee3d177b157..5e7780bd11bb6fddaa696d699f54efef9511fb8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/configure.ac b/configure.ac
index 9909138faa60c85114563d0425bbf3bf322a9eca..8e05e12f8a89c387ab59fcca4121c05ba2445bb1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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])

diff --git a/src/ChangeLog b/src/ChangeLog
index 2175acff90e0b262c527748af441b746ed692a40..a3b7921ffa06dca10cc4f3e6295ad554253c77d6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>

diff --git a/src/Makefile.am b/src/Makefile.am
index 0dd0c293244e0f052c5391b41cd257aaa2f9101c..a5a6a9cb3c25cb77b96bad8607f11b599a1af93d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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                \

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 654ad00e8e6291f7f7b0a23d539d454334c1d9cb..2345566437d51b1624df828400842a2dedcf532f 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -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.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8dafe0739d2330e20f9ff14ac5d43a236d978553..d9b9f9fb3a421744005ff2426a3825962317cd1a 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -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