Ian Turner fixed the libcurl.m4 macro's support for --with-libcurl.

AC_PATH_PROG was not used properly.

diff --git a/CHANGES b/CHANGES
index 488e306e060fd9cd9908017dbfb5dd1e36aa85df..fb23d4b62e13f264f02a77a220601257e63886c4 100644 (file)
--- 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 8e91e5a9229eda769aec66a705e48391cfebd56d..92a7555f3433769ff7952f128c17116d7d4e014a 100644 (file)
--- 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 a9bfa2e230fdd7421799d48e039bc5b57600a2bd..f54a5f2d13e65745324377f7f335c8284783ebb6 100644 (file)
--- 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