You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2004/03/06 17:47:41 UTC
cvs commit: httpd-2.0/support Makefile.in
jorton 2004/03/06 08:47:41
Modified: . acinclude.m4
modules/ssl config.m4
support Makefile.in
Log:
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
Revision Changes Path
1.150 +9 -6 httpd-2.0/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.149
retrieving revision 1.150
diff -w -d -u -r1.149 -r1.150
--- acinclude.m4 19 Jan 2004 22:58:41 -0000 1.149
+++ acinclude.m4 6 Mar 2004 16:47:41 -0000 1.150
@@ -176,7 +176,7 @@
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 @@
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 @@
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
])
1.23 +2 -1 httpd-2.0/modules/ssl/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/config.m4,v
retrieving revision 1.22
retrieving revision 1.23
diff -w -d -u -r1.22 -r1.23
--- config.m4 28 Feb 2004 18:06:34 -0000 1.22
+++ config.m4 6 Mar 2004 16:47:41 -0000 1.23
@@ -78,7 +78,7 @@
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 @@
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
])
1.40 +2 -1 httpd-2.0/support/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/support/Makefile.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -w -d -u -r1.39 -r1.40
--- Makefile.in 3 Feb 2004 19:37:34 -0000 1.39
+++ Makefile.in 6 Mar 2004 16:47:41 -0000 1.40
@@ -50,8 +50,9 @@
$(LINK) $(htdbm_LTFLAGS) $(htdbm_OBJECTS) $(PROGRAM_LDADD)
ab_OBJECTS = ab.lo
+ab_LDADD = $(PROGRAM_LDADD) $(SSL_LIBS)
ab: $(ab_OBJECTS)
- $(LINK) $(ab_LTFLAGS) $(ab_OBJECTS) $(PROGRAM_LDADD)
+ $(LINK) $(ab_LTFLAGS) $(ab_OBJECTS) $(ab_LDADD)
checkgid_OBJECTS = checkgid.lo
checkgid: $(checkgid_OBJECTS)