Merge branch 'maint'

* maint:
  OPENSSL_API_COMPAT must be oldest support 1.0

build/autotools/includes/acinclude.m4

@@ -619,7 +619,7 @@ else
     cf_openssl_basedir="/usr"
   fi
 fi
-SSL_INCLUDES="${SSL_INCLUDES} -DOPENSSL_API_COMPAT=0x10100000L"
+SSL_INCLUDES="${SSL_INCLUDES} -DOPENSSL_API_COMPAT=0x10000000L"
 
 dnl Has it been found by now?
 if test ! -z "$cf_openssl_basedir"; then

configure

@@ -6859,7 +6859,7 @@ else
     cf_openssl_basedir="/usr"
   fi
 fi
-SSL_INCLUDES="${SSL_INCLUDES} -DOPENSSL_API_COMPAT=0x10100000L"
+SSL_INCLUDES="${SSL_INCLUDES} -DOPENSSL_API_COMPAT=0x10000000L"
 
 if test ! -z "$cf_openssl_basedir"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_openssl_basedir" >&5