diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2007-02-14 03:00:08 +0000 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2007-02-14 03:00:08 +0000 |
| commit | 9de4e5ebe44eee500c979ca6119f10deb1668ce1 (patch) | |
| tree | cccd610740041061ed189faee0a302207d3a72b8 | |
| parent | 7033a1c072af505ceb94b73112ec87914935e3fa (diff) | |
| download | curl-9de4e5ebe44eee500c979ca6119f10deb1668ce1.tar.gz | |
Fixed the problem of curl-config --libs specifying unneeded libraries
dependencies to applications.
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | curl-config.in | 8 |
2 files changed, 15 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 52efa5161..43cb2f8e4 100644 --- a/configure.ac +++ b/configure.ac @@ -158,6 +158,15 @@ case $host in ;; esac +# Determine whether all dependent libraries must be specified when linking +if test "X$enable_shared" = "Xyes" -a "X$link_all_deplibs" = "Xno" +then + REQUIRE_LIB_DEPS=no +else + REQUIRE_LIB_DEPS=yes +fi +AC_SUBST(REQUIRE_LIB_DEPS) + dnl The install stuff has already been taken care of by the automake stuff dnl AC_PROG_INSTALL AC_PROG_MAKE_SET diff --git a/curl-config.in b/curl-config.in index aaffda820..9f4513969 100644 --- a/curl-config.in +++ b/curl-config.in @@ -181,8 +181,12 @@ while test $# -gt 0; do ;; --libs) - echo -L@libdir@ -lcurl @LDFLAGS@ @LIBS@ - ;; + if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then + echo -L@libdir@ -lcurl @LDFLAGS@ @LIBS@ + else + echo -L@libdir@ -lcurl @LDFLAGS@ + fi + ;; *) echo "unknown option: $1" |