From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sat, 23 Oct 2010 11:50:31 +0000 (+0200)
Subject: gnutls: fix build under mingw32.
X-Git-Tag: v1.13~89
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=8405493e1d6acd3bf9f308ccec66cae77c2080b0

gnutls: fix build under mingw32.
---

diff --git a/ChangeLog b/ChangeLog
index 147e1d62..5e7780bd 100644
--- 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 9909138f..8e05e12f 100644
--- 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 2175acff..a3b7921f 100644
--- 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 0dd0c293..a5a6a9cb 100644
--- 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 654ad00e..23455664 100644
--- 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 8dafe073..d9b9f9fb 100644
--- 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