Merge branch 'master' into edmonds/libbsd-support

diff --cc configure.ac
Simple merge

diff --cc contrib/libunbound.pc.in
index e3e842695b3c26a114856a6cd6264371e986931e,f7cd1e07413307aebb48e17f3ab233866d4e43bd..1442ed523adcdb37d7e12567e17f3a814d761021
--- 1/contrib/libunbound.pc.in
--- 2/contrib/libunbound.pc.in
+++ b/contrib/libunbound.pc.in
@@@ -7,8 -7,8 +7,8 @@@ Name: unboun
  Description: Library with validating, recursive, and caching DNS resolver
  URL: http://www.unbound.net
  Version: @PACKAGE_VERSION@
- Requires: libcrypto libssl @PC_LIBEVENT_DEPENDENCY@
+ Requires: @PC_CRYPTO_DEPENDENCY@ @PC_LIBEVENT_DEPENDENCY@
 -Requires.private: @PC_PY_DEPENDENCY@
 +Requires.private: @PC_PY_DEPENDENCY@ @PC_LIBBSD_DEPENDENCY@
- Libs: -L${libdir} -lunbound -lssl -lcrypto
+ Libs: -L${libdir} -lunbound
  Libs.private: @SSLLIB@ @LIBS@
- Cflags: -I${includedir} 
+ Cflags: -I${includedir}