Make sure executables are linked against libcrypto with the LIBSSL_LDFLAGS.

Thanks Leo Baltus

diff --git a/Changelog b/Changelog
index b91cc9cb104d33b78645b0e085794c2c98fcaccd..8b7515c58a8d17fce916e308b98042c5f074a893 100644 (file)
--- 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 93364cd68637d012c60e62adc3b9c4b9b3d27f9e..61422a7f5c64e32eece4fe624256500d60ff2a08 100644 (file)
--- 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