httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r422182 - in /httpd/httpd/trunk: configure.in os/config.m4 os/win32/ os/win32/Makefile.in server/mpm/config.m4 server/mpm/winnt/ server/mpm/winnt/Makefile.in server/mpm/winnt/child.c server/mpm/winnt/config.m4
Date Sat, 15 Jul 2006 09:03:53 GMT
Author: pquerna
Date: Sat Jul 15 02:03:52 2006
New Revision: 422182

URL: http://svn.apache.org/viewvc?rev=422182&view=rev
Log:
Bring in basic support for building the winnt MPM under mingw32, using the autoconf build
system.  Currently this will get you to the point of linking errors on gen_test_char.

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

Added:
    httpd/httpd/trunk/os/win32/Makefile.in
    httpd/httpd/trunk/server/mpm/winnt/Makefile.in
    httpd/httpd/trunk/server/mpm/winnt/config.m4
Modified:
    httpd/httpd/trunk/configure.in
    httpd/httpd/trunk/os/config.m4
    httpd/httpd/trunk/os/win32/   (props changed)
    httpd/httpd/trunk/server/mpm/config.m4
    httpd/httpd/trunk/server/mpm/winnt/   (props changed)
    httpd/httpd/trunk/server/mpm/winnt/child.c

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=422182&r1=422181&r2=422182&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Sat Jul 15 02:03:52 2006
@@ -293,6 +293,10 @@
       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/trunk/os/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/config.m4?rev=422182&r1=422181&r2=422182&view=diff
==============================================================================
--- httpd/httpd/trunk/os/config.m4 (original)
+++ httpd/httpd/trunk/os/config.m4 Sat Jul 15 02:03:52 2006
@@ -17,6 +17,10 @@
   OS="cygwin"
   OS_DIR="unix"
   ;;
+*mingw32*)
+  OS="win32"
+  OS_DIR=$OS
+  ;;
 *)
   OS="unix"
   OS_DIR=$OS;;

Propchange: httpd/httpd/trunk/os/win32/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jul 15 02:03:52 2006
@@ -6,3 +6,6 @@
 *.mak
 mod_*D
 mod_*R
+.deps
+.libs
+Makefile

Added: httpd/httpd/trunk/os/win32/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/Makefile.in?rev=422182&view=auto
==============================================================================
--- httpd/httpd/trunk/os/win32/Makefile.in (added)
+++ httpd/httpd/trunk/os/win32/Makefile.in Sat Jul 15 02:03:52 2006
@@ -0,0 +1,5 @@
+
+LTLIBRARY_NAME    = libos.la
+LTLIBRARY_SOURCES = util_win32.c ap_regkey.c modules.c
+
+include $(top_srcdir)/build/ltlib.mk

Modified: httpd/httpd/trunk/server/mpm/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/config.m4?rev=422182&r1=422181&r2=422182&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/config.m4 (original)
+++ httpd/httpd/trunk/server/mpm/config.m4 Sat Jul 15 02:03:52 2006
@@ -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 @@
 	
 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

Propchange: httpd/httpd/trunk/server/mpm/winnt/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jul 15 02:03:52 2006
@@ -0,0 +1,3 @@
+.deps
+.libs
+Makefile

Added: httpd/httpd/trunk/server/mpm/winnt/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/Makefile.in?rev=422182&view=auto
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/Makefile.in (added)
+++ httpd/httpd/trunk/server/mpm/winnt/Makefile.in Sat Jul 15 02:03:52 2006
@@ -0,0 +1,5 @@
+
+LTLIBRARY_NAME    = libwinnt.la
+LTLIBRARY_SOURCES = child.c mpm_winnt.c nt_eventlog.c service.c
+
+include $(top_srcdir)/build/ltlib.mk

Modified: httpd/httpd/trunk/server/mpm/winnt/child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/child.c?rev=422182&r1=422181&r2=422182&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/child.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/child.c Sat Jul 15 02:03:52 2006
@@ -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;
 

Added: httpd/httpd/trunk/server/mpm/winnt/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/config.m4?rev=422182&view=auto
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/config.m4 (added)
+++ httpd/httpd/trunk/server/mpm/winnt/config.m4 Sat Jul 15 02:03:52 2006
@@ -0,0 +1,3 @@
+if test "$MPM_NAME" = "winnt" ; then
+    APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
+fi



Mime
View raw message