diff options
| author | Stefan Fritsch <sf@apache.org> | 2012-10-07 10:56:45 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2012-10-07 10:56:45 +0200 |
| commit | 67fde08ec75c0228b635e35421339333653a7c2c (patch) | |
| tree | 31e3e649adc42131e1ed45f77d63293f08b44db0 /acinclude.m4 | |
| parent | Allow forced setting of TLS1.1 and TLS1.2 protocols with (diff) | |
| download | apache2-67fde08ec75c0228b635e35421339333653a7c2c.tar.xz apache2-67fde08ec75c0228b635e35421339333653a7c2c.zip | |
Fix usage of MOD_* variables for MPM modules
r1385216 broke building of mpm event with serf support. To fix,
* introduce APACHE_MPMPATH_INIT/FINISH similar to
APACHE_MODPATH_INIT/FINISH to create modules.mk and add
MOD_* vars to it.
* change APACHE_MPM_MODULE to only append to modules.mk, not
overwrite
* add APACHE_MPMPATH_INIT/FINISH to all MPMs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1395252 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 444f385e19..86d2e08c51 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -217,6 +217,27 @@ EOF fi fi ])dnl +dnl Same as APACHE_MODPATH_INIT/FINISH but for MPMs +dnl APACHE_MPMPATH_INIT(mpmpath) +AC_DEFUN(APACHE_MPMPATH_INIT,[ + current_dir=$1 + modpath_current=server/mpm/$1 + modpath_static= + modpath_shared= + for var in mod_buildvars; do + eval MOD_$var= + done + test -d $1 || $srcdir/build/mkdir.sh $modpath_current + > $modpath_current/modules.mk +])dnl +dnl +AC_DEFUN(APACHE_MPMPATH_FINISH,[ + for var in mod_buildvars; do + if eval val=\"\$MOD_$var\"; test -n "$val"; then + echo "MOD_$var = $val" >> $modpath_current/modules.mk + fi + done +])dnl dnl dnl APACHE_MPM_MODULE(name[, shared[, objects[, config[, path[, libs]]]]]) @@ -253,7 +274,7 @@ AC_DEFUN(APACHE_MPM_MODULE,[ if test -z "$2"; then APR_ADDTO(AP_LIBS, [$6]) libname="lib$1.la" - cat >$mpmpath/modules.mk<<EOF + cat >>$mpmpath/modules.mk<<EOF $libname: $objects \$(MOD_LINK) $objects DISTCLEAN_TARGETS = modules.mk @@ -264,7 +285,7 @@ EOF apache_need_shared=yes libname="mod_mpm_$1.la" shobjects=`echo $objects | sed 's/\.lo/.slo/g'` - cat >$mpmpath/modules.mk<<EOF + cat >>$mpmpath/modules.mk<<EOF $libname: $shobjects \$(SH_LINK) -rpath \$(libexecdir) -module -avoid-version $objects $6 DISTCLEAN_TARGETS = modules.mk |