This patch removes the --with-tls option and adds the APACHE_CHECK_SSL_TOOLKIT
macro (which defines --with-ssl) for finding the users SSL toolkit. --with-tls
seems to be a bit broken, and it seems a bit confusing to have two configure
options that do the same thing.
So now all the user needs to specify is --enable-tls, and only --with-ssl=dir
if configure cannot find the SSL toolkit.
-Ryan
Index: modules/tls/README
===================================================================
RCS file: /home/cvspublic/httpd-2.0/modules/tls/README,v
retrieving revision 1.2
diff -u -r1.2 README
--- modules/tls/README 2001/02/11 20:19:41 1.2
+++ modules/tls/README 2001/06/01 20:32:25
@@ -1,15 +1,13 @@
-This currently won't work with Apache unaided. The manual things I
-have to do to make it work are:
-
To configure this module you must use:
--enable-tls
---with-ssl=/path/to/ssl/library
+
+If configure cannot find your SSL libraries, use the --with-ssl=DIR option.
For example:
--enable-tls
---with-ssl=/home/rbb/openssl-0.9.6
+--with-ssl=/usr/local/ssl
NOTE: You must be using OpenSSL 0.9.6 or later in order for this to work.
Index: modules/tls/config.m4
===================================================================
RCS file: /home/cvspublic/httpd-2.0/modules/tls/config.m4,v
retrieving revision 1.9
diff -u -r1.9 config.m4
--- modules/tls/config.m4 2001/05/08 08:56:39 1.9
+++ modules/tls/config.m4 2001/06/01 20:32:25
@@ -3,46 +3,7 @@
tls_objs="mod_tls.lo openssl_state_machine.lo"
APACHE_MODULE(tls, TLS/SSL support, $tls_objs, , no, [
- AC_MSG_CHECKING(for TLS/SSL library)
- AC_ARG_WITH(tls, [ --with-tls=DIR use a specific TLS/SSL library],
- [
- if test x"$withval" = x"yes"; then
- # FreeBSD has OpenSSL in /usr/{include,lib}
- for dir in /usr /usr/local/openssl /usr/local/ssl
- do
- if test -d $dir && test -f $dir/lib/libcrypto.a; then
- withval=$dir
- break
- fi
- done
- if test x"$withval" = x"yes"; then
- AC_MSG_ERROR(Use --with-tls=DIR to specify the location of your SSL
installation)
- fi
- fi
- ssl_lib=unknown
- for params in \
- "OpenSSL|/include/openssl|/lib|-lssl -lcrypto" \
- "SSLC|/inc||-lsslc"
- do
- prod=`IFS="|"; set -- $params; echo $1`
- incdir=`IFS="|"; set -- $params; echo $2`
- libdir=`IFS="|"; set -- $params; echo $3`
- libs=`IFS="|"; set -- $params; echo $4`
- searchfile="${withval}${incdir}/ssl.h"
- if test -f ${searchfile} ; then
- APR_ADDTO(INCLUDES, [-I${withval}${incdir}])
- APR_ADDTO(LIBS, [-L${withval}${libdir} ${libs}])
- ssl_lib="${prod}"
- break
- fi
- done
- if test x"${ssl_lib}" = x"unknown"; then
- AC_MSG_ERROR(--with-tls given but no appropriate lib found)
- else
- AC_MSG_RESULT(found $ssl_lib)
- fi
- ],[
- AC_MSG_ERROR(--with-tls not given)
- ] ) ] )
+ APACHE_CHECK_SSL_TOOLKIT
+])
APACHE_MODPATH_FINISH
