cvs commit: httpd-2.0 CHANGES acinclude.m4

[ma...@apache.org]

madhum      2003/03/13 12:42:06

  Modified:    .        CHANGES acinclude.m4
  Log:
  Modify the APACHE_CHECK_SSL_TOOLKIT to detect SSL-C (atleast version 2.1).
  Submitted by: Madhusudan Mathihalli
  
  Revision  Changes    Path
  1.1123    +2 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1122
  retrieving revision 1.1123
  diff -u -r1.1122 -r1.1123
  --- CHANGES	13 Mar 2003 20:36:38 -0000	1.1122
  +++ CHANGES	13 Mar 2003 20:42:06 -0000	1.1123
  @@ -2,6 +2,8 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) Modify APACHE_CHECK_SSL_TOOLKIT to detect SSL-C. [Madhusudan Mathihalli]
  +     
     *) Replace the APACHE_CHECK_SSL_TOOLKIT method with a cleaner one, using
        autoconf tools (AC_CHECK_HEADER, AC_CHECK_LIB etc). 
        [Geoff Thorpe <ge...@geoffthorpe.net>]
  
  
  
  1.138     +19 -7     httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.137
  retrieving revision 1.138
  diff -u -r1.137 -r1.138
  --- acinclude.m4	13 Mar 2003 20:36:38 -0000	1.137
  +++ acinclude.m4	13 Mar 2003 20:42:06 -0000	1.138
  @@ -369,8 +369,12 @@
       dnl so it's SSL-C - report, then test anything relevant
       echo "... SSL/TLS support configuring for SSL-C"
       AC_MSG_CHECKING(for SSL-C version)
  -    dnl FIXME: we currently don't check anything for SSL-C
  -    AC_MSG_RESULT([OK, but I didn't really check])
  +    AC_TRY_COMPILE([#include <sslc.h>],
  +[#if !defined(SSLC_VERSION_NUMBER) || SSLC_VERSION_NUMBER < 0x2100
  +#error "invalid SSL-C version"
  +#endif],
  +    [AC_MSG_RESULT(OK)],
  +    [AC_MSG_ERROR([SSL-C Versions < 2.1 has not been tested])])
     fi
     dnl restore
     CPPFLAGS=$saved_CPPFLAGS
  @@ -389,8 +393,12 @@
     dnl make sure "other" flags are available so libcrypto and libssl can link
     LIBS="$LIBS `$apr_config --libs`"
     liberrors=""
  -  AC_CHECK_LIB(crypto, SSLeay_version, [], [liberrors="yes"])
  -  AC_CHECK_LIB(ssl, SSL_CTX_new, [], [liberrors="yes"])
  +  if test "$ap_ssltk_type" = "openssl"; then
  +    AC_CHECK_LIB(crypto, SSLeay_version, [], [liberrors="yes"])
  +    AC_CHECK_LIB(ssl, SSL_CTX_new, [], [liberrors="yes"])
  +  else
  +    AC_CHECK_LIB(sslc, SSL_CTX_new, [], [liberrors="yes"])
  +  fi
     if test "x$liberrors" != "x"; then
       AC_MSG_ERROR([... Error, SSL/TLS libraries were missing or unusable])
     fi
  @@ -416,9 +424,13 @@
         APR_ADDTO(LDFLAGS, ["$ap_platform_runtime_link_flag$ap_ssltk_libdir"])
       fi
     fi
  -  dnl (d) add "-lssl -lcrypto" to LIBS because restoring LIBS after
  -  dnl AC_CHECK_LIB() obliterates any flags AC_CHECK_LIB() added.
  -  APR_ADDTO(LIBS, [-lssl -lcrypto])
  +  dnl (d) add "-lssl -lcrypto" OR "-lsslc" to LIBS because restoring LIBS
  +  dnl after AC_CHECK_LIB() obliterates any flags AC_CHECK_LIB() added.
  +  if test "$ap_ssltk_type" = "openssl"; then
  +    APR_ADDTO(LIBS, [-lssl -lcrypto])
  +  else
  +    APR_ADDTO(LIBS, [-lsslc])
  +  fi
   fi
   ])