From: Stefan Fritsch <sf@apache.org>
Date: Sun, 7 Oct 2012 08:56:45 +0000 (+0000)
Subject: Fix usage of MOD_* variables for MPM modules
X-Git-Tag: 2.5.0-alpha~6227
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67fde08ec75c0228b635e35421339333653a7c2c;p=apache

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
---

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
diff --git a/server/mpm/event/config3.m4 b/server/mpm/event/config3.m4
index 5c96fe3c30..abce9a4f2a 100644
--- a/server/mpm/event/config3.m4
+++ b/server/mpm/event/config3.m4
@@ -1,3 +1,5 @@
+APACHE_MPMPATH_INIT(event)
+
 dnl ## XXX - Need a more thorough check of the proper flags to use
 
 APACHE_CHECK_SERF
@@ -9,3 +11,5 @@ APACHE_SUBST(MOD_MPM_EVENT_LDADD)
 APACHE_MPM_MODULE(event, $enable_mpm_event, event.lo fdqueue.lo pod.lo,[
     AC_CHECK_FUNCS(pthread_kill)
 ], , [\$(MOD_MPM_EVENT_LDADD)])
+
+APACHE_MPMPATH_FINISH
diff --git a/server/mpm/mpmt_os2/config5.m4 b/server/mpm/mpmt_os2/config5.m4
index c74f1452bb..e7ce84e6f8 100644
--- a/server/mpm/mpmt_os2/config5.m4
+++ b/server/mpm/mpmt_os2/config5.m4
@@ -1,3 +1,7 @@
+APACHE_MPMPATH_INIT(mpmt_os2)
+
 APACHE_MPM_MODULE(mpmt_os2, $enable_mpm_mpmt_os2, mpmt_os2.lo mpmt_os2_child.lo,[
     APR_ADDTO(CFLAGS,-Zmt)
 ])
+
+APACHE_MPMPATH_FINISH
diff --git a/server/mpm/prefork/config3.m4 b/server/mpm/prefork/config3.m4
index 25fd8df339..76a559b9bc 100644
--- a/server/mpm/prefork/config3.m4
+++ b/server/mpm/prefork/config3.m4
@@ -1 +1,5 @@
+APACHE_MPMPATH_INIT(prefork)
+
 APACHE_MPM_MODULE(prefork, $enable_mpm_prefork)
+
+APACHE_MPMPATH_FINISH
diff --git a/server/mpm/simple/config3.m4 b/server/mpm/simple/config3.m4
index e518119518..e6207b01a4 100644
--- a/server/mpm/simple/config3.m4
+++ b/server/mpm/simple/config3.m4
@@ -1,3 +1,7 @@
+APACHE_MPMPATH_INIT(simple)
+
 simple_objects="simple_api.lo simple_children.lo simple_core.lo \
 simple_event.lo simple_run.lo simple_io.lo"
 APACHE_MPM_MODULE(simple, $enable_mpm_simple, $simple_objects)
+
+APACHE_MPMPATH_FINISH
diff --git a/server/mpm/winnt/config3.m4 b/server/mpm/winnt/config3.m4
index f937e40495..c9499569e6 100644
--- a/server/mpm/winnt/config3.m4
+++ b/server/mpm/winnt/config3.m4
@@ -1,2 +1,6 @@
+APACHE_MPMPATH_INIT(winnt)
+
 winnt_objects="child.lo mpm_winnt.lo nt_eventlog.lo service.lo"
 APACHE_MPM_MODULE(winnt, $enable_mpm_winnt, $winnt_objects)
+
+APACHE_MPMPATH_FINISH
diff --git a/server/mpm/worker/config3.m4 b/server/mpm/worker/config3.m4
index dc2bccb554..7d7ab3dd66 100644
--- a/server/mpm/worker/config3.m4
+++ b/server/mpm/worker/config3.m4
@@ -1,5 +1,8 @@
-dnl ## XXX - Need a more thorough check of the proper flags to use
+APACHE_MPMPATH_INIT(worker)
 
+dnl ## XXX - Need a more thorough check of the proper flags to use
 APACHE_MPM_MODULE(worker, $enable_mpm_worker, worker.lo fdqueue.lo pod.lo,[
     AC_CHECK_FUNCS(pthread_kill)
 ])
+
+APACHE_MPMPATH_FINISH