From: Rafaël Carré <funman@videolan.org>
Date: Sat, 26 Nov 2011 19:51:32 +0000 (-0500)
Subject: contrib: fix gnutls.pc on win32
X-Git-Tag: 1.3.0-git~32
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=525abdab4db413884b4d03e0d32d67ac35dff17d;p=vlc

contrib: fix gnutls.pc on win32
---

diff --git a/contrib/src/gnutls/gnutls-win32.patch b/contrib/src/gnutls/gnutls-win32.patch
index 2ef739b621..1f369edb97 100644
--- a/contrib/src/gnutls/gnutls-win32.patch
+++ b/contrib/src/gnutls/gnutls-win32.patch
@@ -18,3 +18,14 @@
  libc_hidden_def (gai_strerror)
  #endif
 
+--- gnutls/lib/gnutls.pc.in.orig	2011-11-26 14:40:52.343740836 -0500
++++ gnutls/lib/gnutls.pc.in	2011-11-26 14:41:49.456024042 -0500
+@@ -19,7 +19,7 @@
+ Description: Transport Security Layer implementation for the GNU system
+ URL: http://www.gnu.org/software/gnutls/
+ Version: @VERSION@
+-Libs: -L${libdir} -lgnutls
++Libs: -L${libdir} -lgnutls -lws2_32 -lcrypt32 @LTLIBINTL@
+ Libs.private: @LTLIBGCRYPT@ @NETTLE_LIBS@
+ @GNUTLS_REQUIRES_PRIVATE@
+ Cflags: -I${includedir}
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 73a845671c..d2db2a038a 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -15,7 +15,9 @@ $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.bz2:
 
 gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2 .sum-gnutls
 	$(UNPACK)
+ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/gnutls/gnutls-win32.patch
+endif
 	$(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch
 	$(MOVE)