summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2008-01-10 22:14:02 +0000
committerDaniel Stenberg <daniel@haxx.se>2008-01-10 22:14:02 +0000
commit8df7e0bdbab86344e85827c41e5e100043e0f77f (patch)
treea437d65d80f3bb6d57ea9ecd806d64a3713decc1
parent14ff7e75e09d5a9388f219c684ccb9edea467044 (diff)
downloadcurl-8df7e0bdbab86344e85827c41e5e100043e0f77f.tar.gz
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.
-rw-r--r--CHANGES5
-rw-r--r--RELEASE-NOTES1
-rw-r--r--curl-config.in4
3 files changed, 8 insertions, 2 deletions
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, <daniel@haxx.se>, et al.
+# Copyright (C) 2001 - 2008, Daniel Stenberg, <daniel@haxx.se>, 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=""