diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | curl-config.in | 11 |
2 files changed, 13 insertions, 3 deletions
@@ -6,6 +6,11 @@ Changelog +Dan F (14 February 2007) +- Fixed curl-config --libs so it doesn't list unnecessary libraries (and + therefore introduce unnecessary dependencies) when it's not needed. + Also, don't bother adding a library path of /usr/lib + Daniel (13 February 2007) - The default password for anonymous FTP connections is now changed to be "ftp@example.com". diff --git a/curl-config.in b/curl-config.in index 9f4513969..c5d046e10 100644 --- a/curl-config.in +++ b/curl-config.in @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2001 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 2001 - 2007, 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 @@ -181,10 +181,15 @@ while test $# -gt 0; do ;; --libs) + if test "X@libdir@" != "X/usr/lib"; then + CURLLIBDIR="-L@libdir@ " + else + CURLLIBDIR="" + fi if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then - echo -L@libdir@ -lcurl @LDFLAGS@ @LIBS@ + echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@ else - echo -L@libdir@ -lcurl @LDFLAGS@ + echo ${CURLLIBDIR}-lcurl @LDFLAGS@ fi ;; |