From 4c8adc8fee5e55754da3d8f8d982733a7bf3dece Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 17 Nov 2009 18:11:06 +0000
Subject: [PATCH] - Marc Kleine-Budde fixed: curl saved the LDFLAGS set during
 configure into   its pkg-config file.  So -Wl stuff ended up in the .pc file,
 which is really   bad, and breaks if there are multiple -Wl in our LDFLAGS
 (which are in   PTXdist). bug #2893592
 (http://curl.haxx.se/bug/view.cgi?id=2893592)

---
 CHANGES       | 6 ++++++
 RELEASE-NOTES | 4 +++-
 libcurl.pc.in | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 021bbb6db..f3624414e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,12 @@
 
                                   Changelog
 
+Daniel Stenberg (17 Nov 2009)
+- Marc Kleine-Budde fixed: curl saved the LDFLAGS set during configure into
+  its pkg-config file.  So -Wl stuff ended up in the .pc file, which is really
+  bad, and breaks if there are multiple -Wl in our LDFLAGS (which are in
+  PTXdist). bug #2893592 (http://curl.haxx.se/bug/view.cgi?id=2893592)
+
 Kamil Dudka (15 Nov 2009)
 - David Byron improved the configure script to use pkg-config to find OpenSSL
   (and in particular the list of required libraries) even if a path is given
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 851e68cc4..4d43e10d9 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -21,6 +21,7 @@ This release includes the following bugfixes:
  o compilation when configured --with-gssapi having GNU GSS installed
  o SSL connection reused with mismatched protection level
  o configure --with-nss is set but not "yes"
+ o don't store LDFLAGS in pkg-config file
 
 This release includes the following known bugs:
 
@@ -30,6 +31,7 @@ This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
  Yang Tse, Kamil Dudka, Christian Schmitz, Constantine Sapuntzakis,
- Marco Maggi, Camille Moncelier, Claes Jakobsson, Kevin Baughman
+ Marco Maggi, Camille Moncelier, Claes Jakobsson, Kevin Baughman,
+ Marc Kleine-Budde
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/libcurl.pc.in b/libcurl.pc.in
index eaf853781..80fb8f9d5 100644
--- a/libcurl.pc.in
+++ b/libcurl.pc.in
@@ -35,6 +35,6 @@ Name: libcurl
 URL: http://curl.haxx.se/
 Description: Library to transfer files with ftp, http, etc.
 Version: @VERSION@
-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
+Libs: -L${libdir} -lcurl @LIBS@
 Libs.private: @LIBCURL_LIBS@ @LIBS@
 Cflags: -I${includedir}