aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2007-02-19 12:37:04 +0000
committerDaniel Stenberg <daniel@haxx.se>2007-02-19 12:37:04 +0000
commit1297c54b2627db727184b4bec5ea3d696d8a1c10 (patch)
treed1d5636a70d4e134bdc9d7543deb5162089b16ac
parent1045b8d3828db484bb7e1f8162362d10cc21d2f3 (diff)
Ian Turner fixed the libcurl.m4 macro's support for --with-libcurl.
AC_PATH_PROG was not used properly.
-rw-r--r--CHANGES2
-rw-r--r--RELEASE-NOTES3
-rw-r--r--docs/libcurl/libcurl.m43
3 files changed, 6 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 488e306e0..fb23d4b62 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,8 @@
Changelog
Daniel (19 February 2007)
+- Ian Turner fixed the libcurl.m4 macro's support for --with-libcurl.
+
- Shmulik Regev found a memory leak in re-used HTTPS connections, at least
when the multi interface was used.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8e91e5a92..92a7555f3 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -26,6 +26,7 @@ This release includes the following bugfixes:
o curl_multi_remove_handle() rare crash
o passive FTP transfers work with SOCKS
o multi interface HTTPS connection re-use memory leak
+ o libcurl.m4's --with-libcurl is improved
This release includes the following known bugs:
@@ -44,6 +45,6 @@ advice from friends like these:
Yang Tse, Manfred Schwarb, Michael Wallner, Jeff Pohlmeyer, Shmulik Regev,
Rob Crittenden, Robert A. Monat, Dan Fandrich, Duncan Mac-Vicar Prett,
- Michal Marek, Robson Braga Araujo
+ Michal Marek, Robson Braga Araujo, Ian Turner
Thanks! (and sorry if I forgot to mention someone)
diff --git a/docs/libcurl/libcurl.m4 b/docs/libcurl/libcurl.m4
index a9bfa2e23..f54a5f2d1 100644
--- a/docs/libcurl/libcurl.m4
+++ b/docs/libcurl/libcurl.m4
@@ -71,7 +71,8 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
if test -d "$_libcurl_with" ; then
LIBCURL_CPPFLAGS="-I$withval/include"
_libcurl_ldflags="-L$withval/lib"
- AC_PATH_PROG([_libcurl_config],["$withval/bin/curl-config"])
+ AC_PATH_PROG([_libcurl_config],[curl-config],["$withval/bin"],
+ ["$withval/bin"])
else
AC_PATH_PROG([_libcurl_config],[curl-config])
fi