[vlc-commits] contrib: fix gnutls.pc on win32

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sat Nov 26 14:51:32 2011 -0500| [525abdab4db413884b4d03e0d32d67ac35dff17d] | committer: Rafaël Carré

contrib: fix gnutls.pc on win32

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=525abdab4db413884b4d03e0d32d67ac35dff17d
---

 contrib/src/gnutls/gnutls-win32.patch |   11 +++++++++++
 contrib/src/gnutls/rules.mak          |    2 ++
 2 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/contrib/src/gnutls/gnutls-win32.patch b/contrib/src/gnutls/gnutls-win32.patch
index 2ef739b..1f369ed 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 73a8456..d2db2a0 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)