diff options
| author | Stefan Fritsch <sf@apache.org> | 2011-07-24 21:06:59 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2011-07-24 21:06:59 +0200 |
| commit | 5dd473c6d4033fd02f3855daeecc4ddd3618d48f (patch) | |
| tree | 20d02d4775c1539dbdec10ce17112ba7fbe318bc /modules/ssl/config.m4 | |
| parent | adjust mod_proxy build defaults: (diff) | |
| download | apache2-5dd473c6d4033fd02f3855daeecc4ddd3618d48f.tar.xz apache2-5dd473c6d4033fd02f3855daeecc4ddd3618d48f.zip | |
enable mod_ssl at level 'most'
Let's assume that if a system has the openssl dev headers installed in
the default location, it is very unlikely that crypto is forbidden in
the country that the system is located in.
If no ssl toolkit is found, disable mod_ssl instead of aborting.
The actual change is small, use 'diff -b' to review
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1150471 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl/config.m4')
| -rw-r--r-- | modules/ssl/config.m4 | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/modules/ssl/config.m4 b/modules/ssl/config.m4 index 79f1c64bfd..a518b91e65 100644 --- a/modules/ssl/config.m4 +++ b/modules/ssl/config.m4 @@ -43,14 +43,18 @@ ssl_engine_ocsp.lo dnl ssl_util_ocsp.lo dnl " dnl # hook module into the Autoconf mechanism (--enable-ssl option) -APACHE_MODULE(ssl, [SSL/TLS support (mod_ssl)], $ssl_objs, , no, [ +APACHE_MODULE(ssl, [SSL/TLS support (mod_ssl)], $ssl_objs, , most, [ APACHE_CHECK_SSL_TOOLKIT - APR_ADDTO(MOD_SSL_LDADD, [\$(SSL_LIBS)]) - CHECK_OCSP - if test "x$enable_ssl" = "xshared"; then - # The only symbol which needs to be exported is the module - # structure, so ask libtool to hide everything else: - APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module]) + if test "$ac_cv_ssltk" = "yes" ; then + APR_ADDTO(MOD_SSL_LDADD, [\$(SSL_LIBS)]) + CHECK_OCSP + if test "x$enable_ssl" = "xshared"; then + # The only symbol which needs to be exported is the module + # structure, so ask libtool to hide everything else: + APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module]) + fi + else + enable_ssl=no fi ]) |