diff options
| author | Alessandro Ghedini <alessandro@ghedini.me> | 2014-07-17 14:37:28 +0200 |
|---|---|---|
| committer | Kamil Dudka <kdudka@redhat.com> | 2014-07-18 14:20:42 +0200 |
| commit | c6e7cbb94e669b85d3eb8e015ec51d0072112133 (patch) | |
| tree | 3b03a75a135a9ee7ede0cb80a7b4b711f753091e | |
| parent | 12bf451ca4fed1c0a5cebada94bdb90fe2eb3c45 (diff) | |
build: link curl to NSS libraries when NSS support is enabled
This fixes a build failure on Debian caused by commit
24c3cdce88f39731506c287cb276e8bf4a1ce393.
Bug: http://curl.haxx.se/mail/lib-2014-07/0209.html
| -rw-r--r-- | RELEASE-NOTES | 3 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 6e9e5e8d1..09b871cac 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -12,6 +12,7 @@ This release includes the following changes: This release includes the following bugfixes: + o fix a build failure on Debian when NSS support is enabled [1] o This release includes the following known bugs: @@ -27,4 +28,4 @@ advice from friends like these: References to bug reports and discussions on issues: - [1] = + [1] = http://curl.haxx.se/mail/lib-2014-07/0209.html diff --git a/configure.ac b/configure.ac index c3cccfba0..b78f56d0e 100644 --- a/configure.ac +++ b/configure.ac @@ -2078,6 +2078,10 @@ if test "$curl_ssl_msg" = "$init_ssl_msg"; then if test "x$USE_NSS" = "xyes"; then AC_MSG_NOTICE([detected NSS version $version]) + dnl needed when linking the curl tool without USE_EXPLICIT_LIB_DEPS + NSS_LIBS=$addlib + AC_SUBST([NSS_LIBS]) + dnl when shared libs were found in a path that the run-time dnl linker doesn't search through, we need to add it to dnl LD_LIBRARY_PATH to prevent further configure tests to fail diff --git a/src/Makefile.am b/src/Makefile.am index d8c0c7da3..f96618e5e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -62,7 +62,7 @@ LIBS = $(BLANK_AT_MAKETIME) if USE_EXPLICIT_LIB_DEPS curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @LIBCURL_LIBS@ else -curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ +curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ endif curl_LDFLAGS = @LIBMETALINK_LDFLAGS@ |