contrib: fix gnutls.pc on win32

diff --git a/contrib/src/gnutls/gnutls-win32.patch b/contrib/src/gnutls/gnutls-win32.patch
index 2ef739b621ef4adb72b6e2a28fb74af5a02e73f3..1f369edb973290baa83c1d881f933ce5f5bb3cf2 100644 (file)
--- 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 73a845671c9f4033a99d9f99946caddd8d0c562e..d2db2a038af2f33970b8e8568d66b3d189241873 100644 (file)
--- 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)