From 77475f2ad02ca03b52255b39e1255e048f449f07 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 9 May 2006 12:56:35 +0000 Subject: Andreas Ntaflos reported a bug in libcurl.m4: When configuring my GNU autotools project, which optionally (default=yes) uses libcurl on a system without a (usable) libcurl installation, but not specifying `--without-libcurl', configure determines correctly that no libcurl is available, however, the LIBCURL variable gets expanded to `LIBCURL = -lcurl' in the resulting Makefiles. David Shaw fixed the flaw. --- CHANGES | 9 +++++++++ RELEASE-NOTES | 4 +++- docs/libcurl/libcurl.m4 | 5 ++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index c639de990..8af44505f 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,15 @@ Changelog Daniel (9 May 2006) +- Andreas Ntaflos reported a bug in libcurl.m4: When configuring my GNU + autotools project, which optionally (default=yes) uses libcurl on a system + without a (usable) libcurl installation, but not specifying + `--without-libcurl', configure determines correctly that no libcurl is + available, however, the LIBCURL variable gets expanded to `LIBCURL = -lcurl' + in the resulting Makefiles. + + David Shaw fixed the flaw. + - Robson Braga Araujo fixed two problems in the recently added non-blocking SSL connects. The state machine was not reset properly so that subsequent connects using the same handle would fail, and there were two memory leaks. diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 5fe37afd8..2f9909d2e 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -20,6 +20,7 @@ This release includes the following changes: This release includes the following bugfixes: + o libcurl.m4 when default=yes but no libcurl was found o numerous bugs fixed in the TFTP code o possible memory leak when adding easy handles to multi stack o TFTP works in a more portable fashion (== on more platforms) @@ -51,6 +52,7 @@ advice from friends like these: Dan Fandrich, Ilja van Sprundel, David McCreedy, Tor Arntsen, Xavier Bouchoux, David Byron, Michele Bini, Ates Goral, Katie Wang, Robson Braga Araujo, - Ale Vesely, Paul Querna, Gisle Vanem, Mark Eichin, Roland Blom + Ale Vesely, Paul Querna, Gisle Vanem, Mark Eichin, Roland Blom, Andreas + Ntaflos, David Shaw Thanks! (and sorry if I forgot to mention someone) diff --git a/docs/libcurl/libcurl.m4 b/docs/libcurl/libcurl.m4 index 798427c14..a9bfa2e23 100644 --- a/docs/libcurl/libcurl.m4 +++ b/docs/libcurl/libcurl.m4 @@ -1,7 +1,7 @@ # LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION], # [ACTION-IF-YES], [ACTION-IF-NO]) # ---------------------------------------------------------- -# David Shaw Jan-17-2006 +# David Shaw May-09-2006 # # Checks for libcurl. DEFAULT-ACTION is the string yes or no to # specify whether to default to --with-libcurl or --without-libcurl. @@ -210,6 +210,9 @@ x=CURLOPT_VERBOSE; AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1]) eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes done + else + unset LIBCURL + unset LIBCURL_CPPFLAGS fi fi -- cgit v1.2.3