cvs commit: httpd-2.0 acinclude.m4

[wr...@apache.org]

wrowe       2003/05/27 09:53:55

  Modified:    .        acinclude.m4
  Log:
    As Geoff Thorpe <ge...@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.
  
  
  Revision  Changes    Path
  1.140     +4 -0      httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.139
  retrieving revision 1.140
  diff -u -r1.139 -r1.140
  --- acinclude.m4	31 Mar 2003 21:19:07 -0000	1.139
  +++ acinclude.m4	27 May 2003 16:53:54 -0000	1.140
  @@ -396,8 +396,12 @@
     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])