aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2006-02-11 12:56:52 +0000
committerDaniel Stenberg <daniel@haxx.se>2006-02-11 12:56:52 +0000
commitb0bc2f00d2ef005b6322123799af78528f66b713 (patch)
tree0f59a11d59cdb90cb45d1996cc03d4e0fb0742ed
parent3b19c7d0d9933b9e75577b0f2e6e58d26f28f1bf (diff)
Kent Boortz improved the configure check for GnuTLS to properly set LIBS
instead of LDFLAGS.
-rw-r--r--CHANGES4
-rw-r--r--RELEASE-NOTES4
-rw-r--r--configure.ac6
3 files changed, 10 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index d832e811f..88961d32d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
Changelog
+Daniel (11 February 2006)
+- Kent Boortz improved the configure check for GnuTLS to properly set LIBS
+ instead of LDFLAGS.
+
Daniel (8 February 2006)
- Philippe Vaucher provided a brilliant piece of test code that show a problem
with re-used FTP connections. If the second request on the same connection
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9c9c7a675..d7babaab2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -20,6 +20,7 @@ This release includes the following changes:
This release includes the following bugfixes:
+ o improved GnuTLS check in configure
o re-used FTP connections when the second request didn't do a transfer
o plain --limit-rate [num] means bytes
o re-creating a dead connection is no longer counted internally as a followed
@@ -59,6 +60,7 @@ advice from friends like these:
Dov Murik, Jean Jacques Drouin, Andres Garcia, Yang Tse, Gisle Vanem, Dan
Fandrich, Alexander Lazic, Michael Jahn, Andrew Benham, Bryan Henderson,
- David Shaw, Jon Turner, Duane Cathey, Michal Marek, Philippe Vaucher
+ David Shaw, Jon Turner, Duane Cathey, Michal Marek, Philippe Vaucher,
+ Kent Boortz
Thanks! (and sorry if I forgot to mention someone)
diff --git a/configure.ac b/configure.ac
index 792afbb1e..5cfa90d84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1063,10 +1063,10 @@ if test "$OPENSSL_ENABLED" != "1"; then
fi
if test -n "$addlib"; then
- CLEANLDFLAGS="$LDFLAGS"
+ CLEANLIBS="$LIBS"
CLEANCPPFLAGS="$CPPFLAGS"
- LDFLAGS="$LDFLAGS $addlib"
+ LIBS="$LIBS $addlib"
if test "$addcflags" != "-I/usr/include"; then
CPPFLAGS="$CPPFLAGS $addcflags"
fi
@@ -1079,7 +1079,7 @@ if test "$OPENSSL_ENABLED" != "1"; then
curl_ssl_msg="enabled (GnuTLS)"
],
[
- LDFLAGS="$CLEANLDFLAGS"
+ LIBS="$CLEANLIBS"
CPPFLAGS="$CLEANCPPFLAGS"
])