httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1090795 - in /httpd/httpd/branches/2.2.x: STATUS configure.in os/config.m4 server/mpm/config.m4 server/mpm/winnt/child.c
Date Sun, 10 Apr 2011 13:18:23 GMT
Author: trawick
Date: Sun Apr 10 13:18:23 2011
New Revision: 1090795

URL: http://svn.apache.org/viewvc?rev=1090795&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/configure.in
    httpd/httpd/branches/2.2.x/os/config.m4
    httpd/httpd/branches/2.2.x/server/mpm/config.m4
    httpd/httpd/branches/2.2.x/server/mpm/winnt/child.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1090795&r1=1090794&r2=1090795&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sun Apr 10 13:18:23 2011
@@ -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 ]
 

Modified: httpd/httpd/branches/2.2.x/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/configure.in?rev=1090795&r1=1090794&r2=1090795&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/configure.in (original)
+++ httpd/httpd/branches/2.2.x/configure.in Sun Apr 10 13:18:23 2011
@@ -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

Modified: httpd/httpd/branches/2.2.x/os/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/os/config.m4?rev=1090795&r1=1090794&r2=1090795&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/os/config.m4 (original)
+++ httpd/httpd/branches/2.2.x/os/config.m4 Sun Apr 10 13:18:23 2011
@@ -17,6 +17,10 @@ bs2000*)
   OS="cygwin"
   OS_DIR="unix"
   ;;
+*mingw32*)
+  OS="win32"
+  OS_DIR=$OS
+  ;;
 *)
   OS="unix"
   OS_DIR=$OS;;

Modified: httpd/httpd/branches/2.2.x/server/mpm/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/mpm/config.m4?rev=1090795&r1=1090794&r2=1090795&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/config.m4 (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/config.m4 Sun Apr 10 13:18:23 2011
@@ -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

Modified: httpd/httpd/branches/2.2.x/server/mpm/winnt/child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/mpm/winnt/child.c?rev=1090795&r1=1090794&r2=1090795&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/winnt/child.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/winnt/child.c Sun Apr 10 13:18:23 2011
@@ -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;
 



Mime
View raw message