Commit 559e2cc9 authored by Paul Howarth's avatar Paul Howarth Committed by Daniel Stenberg
Browse files

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 c6e7cbb9,
which fixes the same sort of problem for NSS builds.
parent 318ad8d7

configure.ac

+1 −0
Original line number Diff line number Diff line
@@ -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"])

src/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -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@