From 10be1d11995f81afaa21931dfecbe9a5e1b78b83 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Fri, 1 Feb 2013 13:02:07 +0000 Subject: [PATCH] Make sure executables are linked against libcrypto with the LIBSSL_LDFLAGS. Thanks Leo Baltus --- Changelog | 2 ++ Makefile.in | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index b91cc9cb..8b7515c5 100644 --- a/Changelog +++ b/Changelog @@ -3,6 +3,8 @@ for dane needed X509_check_ca function in openssl. * Fix ldns_dnssec_zone_new_frm_fp_l to allow the last parsed line of a zone to be an NSEC3 (or its RRSIG) covering an empty non terminal. + * Make sure executables are linked against libcrypto with the + LIBSSL_LDFLAGS. Thanks Leo Baltus. 1.6.16 2012-11-13 * Fix Makefile to build pyldns with BSD make diff --git a/Makefile.in b/Makefile.in index 93364cd6..61422a7f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -94,8 +94,8 @@ COMP_LIB = $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) LINK = $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) LINK_LIB = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \ $(LIBS) -version-number $(version_info) -no-undefined -LINK_EXE = $(LIBTOOL) --mode=link $(CC) $(CPPFLAGS) \ - $(LIBSSL_CPPFLAGS) $(CFLAGS) $(LDFLAGS) +LINK_EXE = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \ + $(LIBSSL_LDFLAGS) .PHONY: clean realclean docclean manpages doc lint all lib pyldns test .PHONY: install uninstall install-doc uninstall-doc uninstall-pyldns @@ -205,7 +205,8 @@ clean-examples: $(LIBTOOL) --mode clean rm -f $(EXAMPLE_LOBJS) linktest: $(srcdir)/linktest.c libldns.la - $(LIBTOOL) --mode=link $(CC) $(srcdir)/linktest.c $(CPPFLAGS) $(LIBSSL_CPPFLAGS) $(CFLAGS) -lldns $(LIBS) -o linktest + $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/linktest.c -o linktest.lo + $(LINK_EXE) linktest.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o linktest lib: libldns.la -- 2.47.3