These changes allow BeOS to use the new buildconf configuration.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84588 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/mpm/mpmt_beos/Makefile.in b/server/mpm/mpmt_beos/Makefile.in
new file mode 100644 (file)
index 0000000..0abb81e
--- /dev/null
+++ b/server/mpm/mpmt_beos/Makefile.in
@@ -0,0 +1,10 @@
+
+DEPTH     = ../../..
+topsrcdir = @topsrcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+LTLIBRARY_NAME    = libmpmt_beos.la
+LTLIBRARY_SOURCES = mpmt_beos.c scoreboard.c acceptlock.c mutex.c poll.c
+
+include $(topsrcdir)/build/ltlib.mk

diff --git a/server/mpm/mpmt_beos/config.m4 b/server/mpm/mpmt_beos/config.m4
new file mode 100644 (file)
index 0000000..c71adcb
--- /dev/null
+++ b/server/mpm/mpmt_beos/config.m4
@@ -0,0 +1,8 @@
+dnl ## XXX - Need a more thorough check of the proper flags to use
+
+if test "$MPM_NAME" = "mpmt_beos" ; then
+    ac_cv_enable_threads="yes"
+    AC_CACHE_SAVE
+
+    APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
+fi

diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c
index a8f0daeca9bbb3f38b8d2fa51f781579d00db6f2..ea1ab5d870a18133eaaf46531efc085f760dd351 100644 (file)
--- a/server/mpm/mpmt_beos/mpmt_beos.c
+++ b/server/mpm/mpmt_beos/mpmt_beos.c
@@ -1213,7 +1213,6 @@ static void mpmt_beos_pre_config(ap_context_t *pconf, ap_context_t *plog, ap_con
     ap_daemons_limit = HARD_SERVER_LIMIT;
     ap_threads_per_child = DEFAULT_THREADS_PER_CHILD;
     ap_pid_fname = DEFAULT_PIDLOG;
-    ap_scoreboard_fname = DEFAULT_SCOREBOARD;
     ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD;
     ap_mpmt_beos_set_maintain_connection_status(1);