As Geoff Thorpe <geoff@geoffthorpe.net> points out, we must perform our

  compilation tests for the SSL_has_foo functions while we have completely
  populated the config with 'standard' libraries from our apr configuration.

  This allows us to compile more complex dependencies such as the test for
  ENGINE_init(), which also requires -lsockets etc on Solaris for any
  static build of OpenSSL.  If this fails, we will have to research using
  the pkgconfig/openssl.pc configuration to perform these precompile tests.

  This restores the various HAVE_SSL_{FOO} macros for SSL-C and introduced
  the proper test for HAVE_ENGINE_INIT.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100038 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/acinclude.m4 b/acinclude.m4
index ca885ec16f6bc223af3d0aa4abbc30e337682d89..953de7b292eec9891e3464651f8e35469549456c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -396,8 +396,12 @@ if test "x$ap_ssltk_configured" = "x"; then
   if test "$ap_ssltk_type" = "openssl"; then
     AC_CHECK_LIB(crypto, SSLeay_version, [], [liberrors="yes"])
     AC_CHECK_LIB(ssl, SSL_CTX_new, [], [liberrors="yes"])
+    AC_CHECK_FUNCS(ENGINE_init)
   else
+    AC_CHECK_LIB(sslc, SSLC_library_version, [], [liberrors="yes"])
     AC_CHECK_LIB(sslc, SSL_CTX_new, [], [liberrors="yes"])
+    AC_CHECK_FUNCS(SSL_set_cert_store)
+    AC_CHECK_FUNCS(SSL_set_state)
   fi
   if test "x$liberrors" != "x"; then
     AC_MSG_ERROR([... Error, SSL/TLS libraries were missing or unusable])