configure: add basic support to build with MinGW/MSYS, from trunk r422182 by pquerna

2.2.x patch submitted by: fuankg
Reviewed by: wrowe, trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1090795 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 9397978a284792ca78c79ce1d31aaf1f2a5221db..27a5e0eca14b7aa766e88e3a1f76da64268e992b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,11 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * configure: add basic support to build with MinGW/MSYS (backport of r422182)
-     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=422182
-     2.2.x patch: http://people.apache.org/~fuankg/diffs/r422182-2.2.x.diff
-     +1 fuankg, wrowe, trawick
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/configure.in b/configure.in
index 0ccf85911ec68c2690c5891d2e8f68e787ad361a..d37b11dc5298198d7c74527529f7c5a09395a940 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -302,6 +302,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/server/mpm/config.m4 b/server/mpm/config.m4
index 6ea447d1e5d9b7f1874ca8fb376b5253a2adb8a9..b0907769437c8f3a2b9b8bc3bebf6203db9d0f27 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}),[
+                          MPM={beos|event|worker|prefork|mpmt_os2|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" ; then
+    if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "event" -o "$apache_cv_mpm" = "winnt" ; then
         return 0
     else
         return 1

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index d918e47aa7391797ba93cc20893a63fd9c243349..5ad9e728a0fae1b55400c869e6375656bea994df 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;