Commit 6d3b687c authored by Paul Querna's avatar Paul Querna
Browse files

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

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

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

configure.in

+4 −0
Original line number Diff line number Diff line
@@ -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

os/config.m4

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ bs2000*) 
  OS="cygwin"

  OS_DIR="unix"

  ;;

*mingw32*)

  OS="win32"

  OS_DIR=$OS

  ;;

*)

  OS="unix"

  OS_DIR=$OS;;

os/win32/Makefile.in

0 → 100644
+5 −0
Original line number Diff line number Diff line 


LTLIBRARY_NAME    = libos.la

LTLIBRARY_SOURCES = util_win32.c ap_regkey.c modules.c



include $(top_srcdir)/build/ltlib.mk

server/mpm/config.m4

+2 −2
Original line number Diff line number Diff line 
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

server/mpm/winnt/Makefile.in

0 → 100644
+5 −0
Original line number Diff line number Diff line 


LTLIBRARY_NAME    = libwinnt.la

LTLIBRARY_SOURCES = child.c mpm_winnt.c nt_eventlog.c service.c



include $(top_srcdir)/build/ltlib.mk