diff options
| author | Joe Orton <jorton@apache.org> | 2004-03-06 16:47:41 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2004-03-06 16:47:41 +0000 |
| commit | 15e2a44274e9af57a61b75357f75ecedd953cbfb (patch) | |
| tree | 786db5b00e8c7a6e236dd0f416ac4213064953d1 /acinclude.m4 | |
| parent | 7bc45b484553bf91064b224dd5442328aa34f728 (diff) | |
| download | httpd-15e2a44274e9af57a61b75357f75ecedd953cbfb.tar.gz | |
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@102870 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8c620e8309..b77199d6be 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -176,7 +176,7 @@ AC_DEFUN(APACHE_MODPATH_ADD,[ modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<<EOF $libname: $objects - \$(MOD_LINK) $objects + \$(MOD_LINK) $objects $5 EOF else apache_need_shared=yes @@ -268,7 +268,10 @@ AC_DEFUN(APACHE_MODULE,[ fi shared="";; esac - APACHE_MODPATH_ADD($1, $shared, $3) + define([modprefix], [MOD_]translit($1, [a-z-], [A-Z_])) + APACHE_MODPATH_ADD($1, $shared, $3,, [\$(]modprefix[_LDADD)]) + APACHE_SUBST(modprefix[_LDADD]) + undefine([modprefix]) fi ])dnl @@ -462,13 +465,13 @@ if test "x$ap_ssltk_configured" = "x"; then APR_ADDTO(LDFLAGS, ["$ap_platform_runtime_link_flag$ap_ssltk_lib"]) fi fi - dnl (d) add "-lssl -lcrypto" OR "-lsslc" to LIBS because restoring LIBS - dnl after AC_CHECK_LIB() obliterates any flags AC_CHECK_LIB() added. + # Put SSL libraries in SSL_LIBS. if test "$ap_ssltk_type" = "openssl"; then - APR_ADDTO(LIBS, [-lssl -lcrypto]) + APR_SETVAR(SSL_LIBS, [-lssl -lcrypto]) else - APR_ADDTO(LIBS, [-lsslc]) + APR_SETVAR(SSL_LIBS, [-lsslc]) fi + APACHE_SUBST(SSL_LIBS) fi ]) |