Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 11 Feb 2001 20:19:41 -0000
Message-ID: <20010211201941.68879.qmail@apache.org>
From: rbb@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/tls Makefile.in README config.m4

rbb         01/02/11 12:19:41

  Modified:    .        CHANGES
               modules/tls Makefile.in README config.m4
  Log:
  Clean up the mod_tls configure process.  This should remove most, if not
  all, of the hand-editing required to make mod_tls compile.  I have also
  updated the README to reflect the current process.  I have also noted that
  we require OpenSSL 0.9.6 to compile.  I am getting all sorts of warnings
  from the OpenSSL header files, and I get a single error from the OpenSSL
  libraries, but I am assuming that is a problem with my configuration,
  not the mod_tls code.
  
  Revision  Changes    Path
  1.87      +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -d -b -w -u -r1.86 -r1.87
  --- CHANGES	2001/02/11 17:46:18	1.86
  +++ CHANGES	2001/02/11 20:19:40	1.87
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0b1
   
  +  *) Cleanup the mod_tls configure process.  This should remove any need
  +     to hand-edit any files.  We require OpenSSL 0.9.6 or later, but 
  +     configure doesn't check that yet.  [Ryan Bloom]
  +
     *) Add a very early prototype of SSL support (in mod_tls.c). It is
        vital that you read modules/tls/README before attempting to build
        it. [Ben Laurie]
  
  
  
  1.2       +1 -8      httpd-2.0/modules/tls/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/tls/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -d -b -w -u -r1.1 -r1.2
  --- Makefile.in	2001/02/11 17:46:19	1.1
  +++ Makefile.in	2001/02/11 20:19:41	1.2
  @@ -1,9 +1,2 @@
  -LTLIBRARY_NAME    = libapachemod_tls.la
  -LTLIBRARY_SOURCES = mod_tls.lo openssl_state_machine.lo
  -
  -# temp!
  -openssl_state_machine.lo: openssl_state_machine.c
  -	gcc  -I. -I/usr/home/ben/work/httpd-2.0/modules/tls -I/usr/home/ben/work/httpd-2.0/server/mpm/prefork -I/usr/home/ben/work/httpd-2.0/include -I/usr/home/ben/work/httpd-2.0/srclib/apr/include -I/usr/home/ben/work/httpd-2.0/srclib/apr-util/include -I/usr/home/ben/work/httpd-2.0/os/unix -I/usr/home/ben/work/httpd-2.0/srclib/expat-lite -I/home/ben/work/openssl/include  -I/home/ben/work/openssl/include -D_REENTRANT -D_THREAD_SAFE -g -O2 -g -Wall -Wmissing-prototypes -Wmissing-declarations -DAP_DEBUG -DNO_KRB5 -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -c openssl_state_machine.c -o openssl_state_machine.lo
  -
  -include $(top_srcdir)/build/ltlib.mk
  +include $(top_srcdir)/build/special.mk
   
  
  
  
  1.2       +7 -6      httpd-2.0/modules/tls/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/tls/README,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -d -b -w -u -r1.1 -r1.2
  --- README	2001/02/11 17:46:19	1.1
  +++ README	2001/02/11 20:19:41	1.2
  @@ -1,16 +1,17 @@
   This currently won't work with Apache unaided. The manual things I
   have to do to make it work are:
   
  -edit .../httpd-2.0/config_vars.mk:
  +To configure this module you must use:
   
  -Add "-L<where OpenSSL is> -lssl -lcrypto" to EXTRA_LIBS.
  +--enable-tls
  +--with-ssl=/path/to/ssl/library
   
  -Change "modules/tls/mod_tls.la" to "modules/tls/libapachemod_tls.la" in
  -BUILTIN_LIBS.
  +For example:
   
  -edit .../httpd-2.0/modules/tls/Makefile.in:
  +--enable-tls
  +--with-ssl=/home/rbb/openssl-0.9.6
   
  -Diddle with the openssl_state_machine.lo target to match your setup.
  +NOTE:  You must be using OpenSSL 0.9.6 or later in order for this to work.
   
   Then all you need is "TLSFilter on" and "TLSCertificateFile <file>" in
   your config, and you are away (note that the cert file must also
  
  
  
  1.2       +25 -1     httpd-2.0/modules/tls/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/tls/config.m4,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -d -b -w -u -r1.1 -r1.2
  --- config.m4	2001/02/11 17:46:19	1.1
  +++ config.m4	2001/02/11 20:19:41	1.2
  @@ -1,5 +1,29 @@
  +AC_MSG_CHECKING(for SSL library)
   APACHE_MODPATH_INIT(tls)
   
  -APACHE_MODULE(tls, TLS/SSL support, , , no)
  +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 ],
  +  [
  +      searchfile="$withval/inc/ssl.h"
  +      if test -f $searchfile ; then
  +          INCLUDES="$INCLUDES -I$withval/inc"
  +          LIBS="$LIBS -L$withval -lsslc"
  +          ssl_lib="SSLC"
  +      else
  +          searchfile="$withval/ssl/ssl.h"
  +          if test -f $searchfile ; then
  +              INCLUDES="$INCLUDES -I$withval/include"
  +              LIBS="$LIBS -L$withval -lssl -lcrypto"
  +              ssl_lib="OpenSSL"
  +          else
  +              AC_MSG_ERROR(no - Unable to locate $withval/inc/ssl.h)
  +          fi
  +      fi
  +      AC_MSG_RESULT(found $ssl_lib)
  +  ],[
  +      AC_MSG_ERROR(--with-ssl not given)
  +  ] ) ] )
   
   APACHE_MODPATH_FINISH