Commit 4e27ec76 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Added slotmem* modules to Win32 build. 

Submitted by Gregg L. Smith - gregg AT apachehaus.com.


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

Apache.dsw

+48 −0
Changes for Apache.dsw: 48 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -312,6 +312,12 @@ Package=<4> 
    Project_Dep_Name mod_setenvif

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_slotmem_plain

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_slotmem_shm

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_socache_dbm

    End Project Dependency

    Begin Project Dependency
@@ -2858,6 +2864,48 @@ Package=<4> 


###############################################################################



Project: "mod_slotmem_plain"=.\modules\slotmem\mod_slotmem_plain.dsp - Package Owner=<4>



Package=<5>

{{{

}}}



Package=<4>

{{{

    Begin Project Dependency

    Project_Dep_Name libapr

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libaprutil

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libhttpd

    End Project Dependency

}}}



###############################################################################



Project: "mod_slotmem_shm"=.\modules\slotmem\mod_slotmem_shm.dsp - Package Owner=<4>



Package=<5>

{{{

}}}



Package=<4>

{{{

    Begin Project Dependency

    Project_Dep_Name libapr

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libaprutil

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libhttpd

    End Project Dependency

}}}



###############################################################################



Project: "mod_socache_dbm"=.\modules\cache\mod_socache_dbm.dsp - Package Owner=<4>



Package=<5>

Makefile.win

+6 −0
Changes for Makefile.win: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -508,6 +508,10 @@ _build: 
	 $(MAKE) $(MAKEOPT) -f mod_session_cookie.mak CFG="mod_session_cookie - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	 $(MAKE) $(MAKEOPT) -f mod_session_dbd.mak    CFG="mod_session_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	cd ..\..

	cd modules\slotmem

	 $(MAKE) $(MAKEOPT) -f mod_slotmem_plain.mak  CFG="mod_slotmem_plain - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	 $(MAKE) $(MAKEOPT) -f mod_slotmem_shm.mak    CFG="mod_slotmem_shm - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	cd ..\..

!IF EXIST("srclib\openssl")

#	cd modules\session

#	 $(MAKE) $(MAKEOPT) -f mod_session_crypto.mak CFG="mod_session_crypto - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -736,6 +740,8 @@ _copybin: 
	copy modules\session\$(LONG)\mod_session.$(src_so)        "$(inst_so)" <.y

	copy modules\session\$(LONG)\mod_session_cookie.$(src_so) "$(inst_so)" <.y

	copy modules\session\$(LONG)\mod_session_dbd.$(src_so)    "$(inst_so)" <.y

	copy modules\slotmem\$(LONG)\mod_slotmem_plain.$(src_so)    "$(inst_so)" <.y

	copy modules\slotmem\$(LONG)\mod_slotmem_shm.$(src_so)    "$(inst_so)" <.y

!IF EXIST("srclib\openssl")

#	copy modules\session\$(LONG)\mod_session_crypto.$(src_so) "$(inst_so)" <.y

	copy modules\ssl\$(LONG)\mod_ssl.$(src_so) 		"$(inst_so)" <.y

build/installwinconf.awk

+2 −0
Changes for build/installwinconf.awk: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ BEGIN { 
	  print "#LoadModule reflector_module modules/mod_reflector.so" > dstfl;

	  print "#LoadModule rewrite_module modules/mod_rewrite.so" > dstfl;

	  print "LoadModule setenvif_module modules/mod_setenvif.so" > dstfl;

	  print "#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so" > dstfl;

	  print "#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so" > dstfl;

	  print "#LoadModule speling_module modules/mod_speling.so" > dstfl;

	  print "#LoadModule ssl_module modules/mod_ssl.so" > dstfl;

	  print "#LoadModule status_module modules/mod_status.so" > dstfl;

os/win32/BaseAddr.ref

+2 −0
Changes for os/win32/BaseAddr.ref: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -110,3 +110,5 @@ mod_proxy_scgi.so 0x6F7C0000 0x00010000 
mod_serf.so                 0x6F7B0000    0x00010000

mod_reqtimeout.so           0x6F7A0000    0x00010000

mod_reflector.so            0x6F790000    0x00010000

mod_slotmem_plain.so        0x6F780000    0x00010000

mod_slotmem_shm.so          0x6F770000    0x00010000