Bring in basic support for building the winnt MPM under mingw32, using the autoconf...

configure.in: Default to winnt MPM on mingw32 hosts.
configure.in: Add AP_DECLARE_EXPORT for mingw32 hsots.

os/config.m4: Use win32 dir under mingw32.
os/win32/Makefile.in: Add in a new makefile to generate libos on win32.

server/mpm/config.m4: Add winnt MPM to the help string.
server/mpm/config.m4: winnt MPM is a threaded MPM.

server/mpm/winnt/child.c: SO_UPDATE_ACCEPT_CONTEXT is defined under a different header in mingw32.

server/mpm/winnt/{Makefile.in,config.m4}: Base build for winnt MPM.

os/win32,server/mpm/winnt: Update svn:ignore for .deps/.libs

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

diff --git a/configure.in b/configure.in
index 29baee7c8fe91a19c3d2d6c60b0da5969145388c..28f5f824792eacd4051593fbee6b3a2bdbecbfac 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -293,6 +293,10 @@ case $host in
       APR_SETVAR(APACHE_MPM, [prefork])
       APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
       ;;
+  *mingw32*)
+      APR_SETVAR(APACHE_MPM, [winnt])
+      APR_ADDTO(CPPFLAGS, [-DAP_DECLARE_EXPORT])
+      ;;
   *aix*)
       aixver=`echo $host | sed 's/^[[^0-9]]*//' | sed 's/\.//g'`
       if test $aixver -ge 4320; then

diff --git a/os/config.m4 b/os/config.m4
index 336f360d752f9acd72f0c3bcbbfa6aa26a66f8b8..b5ab86bd5b9e49c392d31a04639af13531ce3d56 100644 (file)
--- a/os/config.m4
+++ b/os/config.m4
@@ -17,6 +17,10 @@ bs2000*)
   OS="cygwin"
   OS_DIR="unix"
   ;;
+*mingw32*)
+  OS="win32"
+  OS_DIR=$OS
+  ;;
 *)
   OS="unix"
   OS_DIR=$OS;;

diff --git a/os/win32/Makefile.in b/os/win32/Makefile.in
new file mode 100644 (file)
index 0000000..d243747
--- /dev/null
+++ b/os/win32/Makefile.in
@@ -0,0 +1,5 @@
+\r
+LTLIBRARY_NAME    = libos.la\r
+LTLIBRARY_SOURCES = util_win32.c ap_regkey.c modules.c\r
+\r
+include $(top_srcdir)/build/ltlib.mk\r

diff --git a/server/mpm/config.m4 b/server/mpm/config.m4
index 34018382e1c286ba5e3eeeb4bcef35d4c719e912..f9012a415b841e0f78430167ff3935d1bfda938b 100644 (file)
--- a/server/mpm/config.m4
+++ b/server/mpm/config.m4
@@ -1,7 +1,7 @@
 AC_MSG_CHECKING(which MPM to use)
 AC_ARG_WITH(mpm,
 APACHE_HELP_STRING(--with-mpm=MPM,Choose the process model for Apache to use.
-                          MPM={beos|event|worker|prefork|mpmt_os2|perchild|leader|threadpool}),[
+                          MPM={beos|event|worker|prefork|mpmt_os2|perchild|leader|threadpool|winnt}),[
   APACHE_MPM=$withval
 ],[
   if test "x$APACHE_MPM" = "x"; then
@@ -14,7 +14,7 @@ apache_cv_mpm=$APACHE_MPM
        
 ap_mpm_is_threaded ()
 {
-    if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "event" -o "$apache_cv_mpm" = "perchild" -o "$apache_cv_mpm" = "leader" -o "$apache_cv_mpm" = "threadpool" ; then
+    if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "event" -o "$apache_cv_mpm" = "perchild" -o "$apache_cv_mpm" = "leader" -o "$apache_cv_mpm" = "winnt" -o "$apache_cv_mpm" = "threadpool" ; then
         return 0
     else
         return 1

diff --git a/server/mpm/winnt/Makefile.in b/server/mpm/winnt/Makefile.in
new file mode 100644 (file)
index 0000000..de0ff55
--- /dev/null
+++ b/server/mpm/winnt/Makefile.in
@@ -0,0 +1,5 @@
+\r
+LTLIBRARY_NAME    = libwinnt.la\r
+LTLIBRARY_SOURCES = child.c mpm_winnt.c nt_eventlog.c service.c\r
+\r
+include $(top_srcdir)/build/ltlib.mk\r

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index 8996bfd85faf86b3f46479ee55f37d8d03ded5ea..d950869806ab4e3f53096bbf6f78e9b52fa852c8 100644 (file)
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -39,6 +39,10 @@
 #include <malloc.h>
 #include "apr_atomic.h"
 
+#ifdef __MINGW32__
+#include <mswsock.h>
+#endif 
+
 /* shared with mpm_winnt.c */
 extern DWORD my_pid;
 

diff --git a/server/mpm/winnt/config.m4 b/server/mpm/winnt/config.m4
new file mode 100644 (file)
index 0000000..9320958
--- /dev/null
+++ b/server/mpm/winnt/config.m4
@@ -0,0 +1,3 @@
+if test "$MPM_NAME" = "winnt" ; then\r
+    APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)\r
+fi\r