Commit 5851964b authored by Ralf S. Engelschall's avatar Ralf S. Engelschall
Browse files

Allow mod_tls and mod_ssl coexists without interfering each other by 

renaming the --with-ssl option of mod_tls to --with-tls. This way we can
use --enable-ssl/--with-ssl for mod_ssl and --enable-tls/--with-tls for
mod_tls.


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

modules/tls/config.m4

+3 −3
Original line number Diff line number Diff line 
AC_MSG_CHECKING(for SSL library)

AC_MSG_CHECKING(for TLS/SSL support)

APACHE_MODPATH_INIT(tls)



tls_objs="mod_tls.lo openssl_state_machine.lo"



APACHE_MODULE(tls, TLS/SSL support, $tls_objs, , no, [

  AC_ARG_WITH(ssl,   [ --with-ssl      use a specific SSL library installation ],

  AC_ARG_WITH(tls,   [  --with-tls=DIR          use a specific TLS/SSL library],

  [

      searchfile="$withval/inc/ssl.h"

      if test -f $searchfile ; then
@@ -37,7 +37,7 @@ APACHE_MODULE(tls, TLS/SSL support, $tls_objs, , no, [ 
      fi

      AC_MSG_RESULT(found $ssl_lib)

  ],[

      AC_MSG_ERROR(--with-ssl not given)

      AC_MSG_ERROR(--with-tls not given)

  ] ) ] )



APACHE_MODPATH_FINISH