From 3aaa0378b6be837b84cbcfdbffe13cecaa7e8446 Mon Sep 17 00:00:00 2001 From: Kaspar Brand Date: Sun, 16 Sep 2012 05:55:02 +0000 Subject: Spin off module-specific build options into separate build vars. Add MOD_CFLAGS, MOD_LDFLAGS variables etc. to the build commands, which are available to modules for customization on a per-subdir basis (by adding definitions to modules.mk). Reduces the risk of side-effects when a module needs to add CFLAGS, LDFLAGS etc. and these would be added to the global settings (ALL_CFLAGS etc.). Adapt build settings for mod_ssl, mod_socache_dc, mod_deflate, mod_xml2enc, mod_proxy_html, and mod_lua to use the new MOD_xxx build variables. Change PICFLAGS, SHLTCFLAGS and LTCFLAGS into config vars, instead of AC_SUBSTing them in build/rules.mk.in. For support/ab, introduce ab_CFLAGS and ab_LDFLAGS, and define explicit make targets where they appear at the proper position in the build commands. Consistently use "--with-xxx=PATH" in configure help strings which are used to specify a path to the installation directory of an auxiliary package. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1385214 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/config.m4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'modules/ssl/config.m4') diff --git a/modules/ssl/config.m4 b/modules/ssl/config.m4 index 1ee122e232..8c4f7d6855 100644 --- a/modules/ssl/config.m4 +++ b/modules/ssl/config.m4 @@ -40,11 +40,10 @@ dnl # hook module into the Autoconf mechanism (--enable-ssl option) APACHE_MODULE(ssl, [SSL/TLS support (mod_ssl)], $ssl_objs, , most, [ APACHE_CHECK_OPENSSL if test "$ac_cv_openssl" = "yes" ; then - APR_ADDTO(MOD_SSL_LDADD, [\$(SSL_LIBS)]) 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]) + APR_ADDTO(MOD_LDFLAGS, [-export-symbols-regex ssl_module]) fi else enable_ssl=no -- cgit v1.2.3