Merge branch 'maint'

* maint:
  Give hint on what version of OpenSSL is required
  Only consider ssl installations with shared libs to be valid

build/autotools/includes/acinclude.m4

@@ -542,7 +542,7 @@ if test "$with_openssl_path" != "auto"; then
 else
   dnl Do the auto-probe here.  Check some common directory paths.
   for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/local/openssl; do
-    if test -f "${dirs}/include/openssl/opensslv.h" ; then
+    if test -f "${dirs}/include/openssl/opensslv.h" && test -f "${dirs}/lib/libssl.so"; then
       cf_openssl_basedir="${dirs}"
       break
     fi
@@ -551,7 +551,7 @@ else
 fi
 dnl Now check cf_openssl_found to see if we found anything.
 if test ! -z "$cf_openssl_basedir"; then
-  if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h" ; then
+  if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h" && test -f "${cf_openssl_basedir}/lib/libssl.so"; then
     SSL_INCLUDES="-I${cf_openssl_basedir}/include"
     SSL_LIBS="-L${cf_openssl_basedir}/lib"
   else
@@ -592,7 +592,7 @@ AC_TRY_COMPILE([#include <openssl/opensslv.h>],[
 [AC_MSG_RESULT(OK)],
 [
   AC_MSG_RESULT([too old.])
-  AC_MSG_ERROR([OpenSSL version is too old.], 1)
+  AC_MSG_ERROR([OpenSSL version is too old. Must be 0.9.8f+], 1)
 ]
 )
 

configure

@@ -5479,7 +5479,7 @@ if test "$with_openssl_path" != "auto"; then
     cf_openssl_basedir="`echo ${with_openssl_path} | sed 's/\/$//'`"
 else
     for dirs in /usr/local/ssl /usr/pkg /usr/local /usr/local/openssl; do
-    if test -f "${dirs}/include/openssl/opensslv.h" ; then
+    if test -f "${dirs}/include/openssl/opensslv.h" && test -f "${dirs}/lib/libssl.so"; then
       cf_openssl_basedir="${dirs}"
       break
     fi
@@ -5487,7 +5487,7 @@ else
   unset dirs
 fi
 if test ! -z "$cf_openssl_basedir"; then
-  if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h" ; then
+  if test -f "${cf_openssl_basedir}/include/openssl/opensslv.h" && test -f "${cf_openssl_basedir}/lib/libssl.so"; then
     SSL_INCLUDES="-I${cf_openssl_basedir}/include"
     SSL_LIBS="-L${cf_openssl_basedir}/lib"
   else
@@ -5541,7 +5541,7 @@ else
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old." >&5
 $as_echo "too old." >&6; }
-  as_fn_error 1 "OpenSSL version is too old." "$LINENO" 5
+  as_fn_error 1 "OpenSSL version is too old. Must be 0.9.8f+" "$LINENO" 5
 
 
 fi

doc/UPDATES

@@ -7,6 +7,7 @@ maint
   * Fix build with clang (FreeBSD 10)
   * Fix startup crash when some shared library symbols were missing
   * Fix build on systems without working libssp
+  * Fix build detecting invalid openssl installations (ones with only static libs)
 
 1.4.3
   * Default 'set promisc' to ignore since it's usually a false positive