diff --git a/CHANGES b/CHANGES index 97ac04820..a9b86d674 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,11 @@ Changelog Daniel S (10 Jan 2008) +- Michal Marek made curl-config --libs not include /usr/lib64 in the output + (it already before skipped /usr/lib). /usr/lib64 is the default library + directory on many 64bit systems and it's unlikely that anyone would use the + path privately on systems where it's not. + - Georg Lippitsch brought CURLOPT_SEEKFUNCTION and CURLOPT_SEEKDATA to allow libcurl to seek in a given input stream. This is particularly important when doing upload resumes when there's already a huge part of the file present diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 27d22dc94..8013284a4 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -48,6 +48,7 @@ This release includes the following bugfixes: o socklen_t is no longer used in the public includes o time zone offsets from -1400 to +1400 are now accepted by the date parser o allows more spaces in WWW/Proxy-Authenticate: headers + o curl-config --libs skips /usr/lib64 This release includes the following known bugs: diff --git a/curl-config.in b/curl-config.in index ce98bdee3..107fa2c59 100644 --- a/curl-config.in +++ b/curl-config.in @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2001 - 2007, Daniel Stenberg, , et al. +# Copyright (C) 2001 - 2008, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -189,7 +189,7 @@ while test $# -gt 0; do ;; --libs) - if test "X@libdir@" != "X/usr/lib"; then + if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then CURLLIBDIR="-L@libdir@ " else CURLLIBDIR=""