Commit 11575f83 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Allow mod_tls to compile on Unix boxes where openssl has already been 

installed.
Submitted by:	Gomez Henri <new-httpd@slib.fr>
Reviewed by:	Ryan Bloom


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

CHANGES

+4 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0b1



  *) Allow mod_tls to compile under Unix boxes where openssl has been

     installed to the system include files.

     [Gomez Henri <new-httpd@slib.fr>]



  *) 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]

modules/tls/config.m4

+8 −1
Original line number Diff line number Diff line
@@ -17,10 +17,17 @@ APACHE_MODULE(tls, TLS/SSL support, $tls_objs, , no, [ 
              INCLUDES="$INCLUDES -I$withval/include"

              LIBS="$LIBS -L$withval -lssl -lcrypto"

              ssl_lib="OpenSSL"

          else

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

              if test -f $searchfile ; then

                  INCLUDES="$INCLUDES -I$withval/openssl"

                  LIBS="$LIBS -L$withval -lssl -lcrypto"

                  ssl_lib="OpenSSL"

              else

                  AC_MSG_ERROR(no - Unable to locate $withval/inc/ssl.h)

              fi

          fi

      fi

      AC_MSG_RESULT(found $ssl_lib)

  ],[

      AC_MSG_ERROR(--with-ssl not given)