This fixes a build failure where openssl and libmetalink are used together and the system linker does not do implicit linking (e.g. Fedora 13 and later releases). The MD5 functions required for metalink support must be pulled in from the openssl crypto library.
This is similar to commit c6e7cbb94e669b85d3eb8e015ec51d0072112133, which fixes the same sort of problem for NSS builds. Paul.
>From 5095be9c5e384cfab4ac506ea1506d33e0a58335 Mon Sep 17 00:00:00 2001 From: Paul Howarth <[email protected]> Date: Fri, 9 Jan 2015 09:49:20 +0000 Subject: [PATCH] build: link curl to openssl libraries when openssl support is enabled This fixes a build failure where openssl and libmetalink are used together and the system linker does not do implicit linking (e.g. Fedora 13 and later releases). The MD5 functions required for metalink support must be pulled in from the openssl crypto library. This is similar to commit c6e7cbb94e669b85d3eb8e015ec51d0072112133, which fixes the same sort of problem for NSS builds. --- configure.ac | 1 + src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a1b560c..b75ab05 100644 --- a/configure.ac +++ b/configure.ac @@ -1451,6 +1451,7 @@ if test "$curl_ssl_msg" = "$init_ssl_msg" && test X"$OPT_SSL" != Xno; then SSL_CPPFLAGS=`CURL_EXPORT_PCDIR([$OPENSSL_PCDIR]) dnl $PKGCONFIG --cflags-only-I openssl 2>/dev/null` + AC_SUBST(SSL_LIBS) AC_MSG_NOTICE([pkg-config: SSL_LIBS: "$SSL_LIBS"]) AC_MSG_NOTICE([pkg-config: SSL_LDFLAGS: "$SSL_LDFLAGS"]) AC_MSG_NOTICE([pkg-config: SSL_CPPFLAGS: "$SSL_CPPFLAGS"]) diff --git a/src/Makefile.am b/src/Makefile.am index f96618e..87ef075 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@ @NSS_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ +curl_LDADD = $(top_builddir)/lib/libcurl.la @LIBMETALINK_LIBS@ @NSS_LIBS@ @SSL_LIBS@ @ZLIB_LIBS@ @CURL_NETWORK_AND_TIME_LIBS@ endif curl_LDFLAGS = @LIBMETALINK_LDFLAGS@ -- 2.1.0
------------------------------------------------------------------- List admin: http://cool.haxx.se/list/listinfo/curl-library Etiquette: http://curl.haxx.se/mail/etiquette.html
