package curl: update cherry-picked pkg-config fix

1 files changed, 42 insertions, 5 deletions

diff --git a/src/curl-1-fixes.patch b/src/curl-1-fixes.patch
index e4bfa98..cf0e7ef 100644
--- a/src/curl-1-fixes.patch
+++ b/src/curl-1-fixes.patch
@@ -8,7 +8,7 @@ Also contains mingw-cross-env specific fixes.
 From 017b42a86ec4cac8a4cd71cc607d0a4d201ff4fd Mon Sep 17 00:00:00 2001
 From: Volker Grabsch <vog@notjusthosting.com>
 Date: Fri, 28 Oct 2011 13:48:04 +0200
-Subject: [PATCH 1/5] static linking for mingw-cross-env
+Subject: [PATCH 1/6] static linking for mingw-cross-env
 
 ---
  include/curl/curlbuild.h.in |    3 +++
@@ -35,7 +35,7 @@ index fe348f4..c428273 100644
 From 1ce66d38f2696a25aeac411beaf9e291c8775fe5 Mon Sep 17 00:00:00 2001
 From: Martin Storsjo <martin@martin.st>
 Date: Tue, 15 Nov 2011 11:52:32 +0200
-Subject: [PATCH 2/5] Add support for using nettle instead of gcrypt as gnutls
+Subject: [PATCH 2/6] Add support for using nettle instead of gcrypt as gnutls
  backend (cherry picked from commit
  64f328c787ab763cc994eadd6b82f32490d37ebb)
 
@@ -279,7 +279,7 @@ index f26e027..cf8e053 100644
 From 380fb5054be1ccd85a80220fafbfcb33e1010f05 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Tue, 22 Nov 2011 22:48:15 +0100
-Subject: [PATCH 3/5] gnutls: only translate winsock errors for old versions
+Subject: [PATCH 3/6] gnutls: only translate winsock errors for old versions
 
 Bugfix: https handshake fails using gnutls 3 on windows
 http://sourceforge.net/tracker/index.php?func=detail&aid=3441084&group_id=976&atid=100976
@@ -362,7 +362,7 @@ index a98a7e8..c64c8c4 100644
 From 53b8a80e2e1d3a9a51ed461210a5244abdb0edfb Mon Sep 17 00:00:00 2001
 From: Yang Tse <yangsita@gmail.com>
 Date: Thu, 24 Nov 2011 12:11:52 +0100
-Subject: [PATCH 4/5] Fix unreleased regression when using windows gnutls
+Subject: [PATCH 4/6] Fix unreleased regression when using windows gnutls
  versions older than 2.8 (cherry picked from commit
  78feaff9d800efb5d1f97f8653721718a6cf00c8)
 
@@ -442,7 +442,7 @@ index c64c8c4..a2e8d99 100644
 From 8cd4aa2718f67e50a72bb34c9d8ede803c86b287 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 25 Nov 2011 23:00:16 +0100
-Subject: [PATCH 5/5] configure: add support for pkg-config detection of
+Subject: [PATCH 5/6] configure: add support for pkg-config detection of
  libidn (cherry picked from commit
  874855b743bd7e9bbbaebe2834dd281d2b2cea80)
 
@@ -473,3 +473,40 @@ index 2ba6625..52158f1 100644
 -- 
 1.7.7.3
 
+
+From e5d7e688946a01c4c24568981fa7252aadf818b4 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Sun, 27 Nov 2011 20:00:30 +0100
+Subject: [PATCH 6/6] configure: fix to make older pkg-config play well
+
+configure.ac:1349: error: possibly undefined macro: PKG_CONFIG_LIBDIR
+
+Obviously this is not a problem with pkg-config 0.26 but older versions
+seem to show this.
+
+Fix suggested by: Kamil Dudka
+Reported by: Guenter
+Bug: http://curl.haxx.se/mail/lib-2011-11/0298.html
+(cherry picked from commit 11e52ef0a157acd6a6711b7635cda50467e606ae)
+---
+ configure.ac |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 52158f1..7d2c7e4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2377,6 +2377,10 @@ case "$LIBIDN" in
+        fi
+ 
+        if test "x$idn" != "xyes"; then
++
++         dnl to prevent errors with pkg-config < 0.26
++         m4_pattern_allow(PKG_CONFIG_LIBDIR)
++
+          dnl check with pkg-config
+          PKG_CHECK_MODULES(LIBIDN_PC, libidn >= 0.0.0, [idn=yes], [idn=no])
+          if test "x$idn" = "xyes"; then
+-- 
+1.7.7.3
+