From 25f3693c9d0dff7ec3c4564f1aec4d3379723faf Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Sat, 6 Mar 2004 16:47:41 +0000 Subject: [PATCH] Fix use of mod_ssl as a DSO linked against static SSL libraries; also stop linking all of support/* against the SSL libraries: * acinclude.m4 (APACHE_MODULE): Define MOD_FOO_LDADD which each module .la library will be linked against. (APACHE_MODPATH_ADD): Link static modules against the provided libraries. (APACHE_CHECK_SSL_TOOLKIT): Put SSL libraries in SSL_LIBS and export that to config_vars.mk. * support/Makefile.in: Link ab against SSL_LIBS. * modules/ssl/config.m4: Add SSL_LIBS and distcache libraries to MOD_SSL_LDADD. PR: 17217 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@102870 13f79535-47bb-0310-9956-ffa450edef68 --- config.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.m4 b/config.m4 index 9795f1c5dde..4c115761cb1 100644 --- a/config.m4 +++ b/config.m4 @@ -78,7 +78,7 @@ ap_ssltk_dc="no"]) if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno"; then AC_MSG_ERROR(distcache support failed: $tmp_nomessage) else - APR_ADDTO(LIBS,[-ldistcache -lnal]) + APR_ADDTO(MOD_SSL_LDADD, [-ldistcache -lnal]) AC_DEFINE(HAVE_DISTCACHE, 1, [Define if distcache support is enabled]) fi fi @@ -114,6 +114,7 @@ ssl_util_ssl.lo dnl dnl # hook module into the Autoconf mechanism (--enable-ssl option) APACHE_MODULE(ssl, [SSL/TLS support (mod_ssl)], $ssl_objs, , no, [ APACHE_CHECK_SSL_TOOLKIT + APR_SETVAR(MOD_SSL_LDADD, [\$(SSL_LIBS)]) CHECK_DISTCACHE ]) -- 2.47.2