Author: mladen.turk(a)jboss.com Date: 2008-10-12 07:16:44 -0400 (Sun, 12 Oct 2008) New Revision: 1946 Modified: trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor Log: Allow building httpd 2.2.9+ Modified: trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile 2008-10-09 14:24:37 UTC (rev 1945) +++ trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile 2008-10-12 11:16:44 UTC (rev 1946) @@ -36,8 +36,13 @@ $(SRCDIR)\NMAKEproxyhttp \ $(SRCDIR)\NMAKEproxyftp \ $(SRCDIR)\NMAKEproxyconnect \ - $(SRCDIR)\NMAKEproxybalancer \ + $(SRCDIR)\NMAKEproxybalancer + +!IF EXIST($(SRCDIR)\mod_proxy_cluster.c) +MODULES = \ + $(MODULES) \ $(SRCDIR)\NMAKEproxycluster +!ENDIF $(MODULES): @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2008-10-09 14:24:37 UTC (rev 1945) +++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2008-10-12 11:16:44 UTC (rev 1946) @@ -125,6 +125,16 @@ $(WORKDIR)\xmlrole.obj \ $(WORKDIR)\xmltok.obj +# Include APU 1.3 sources +!IF EXIST($(SRCDIR)\misc\apu_dso.c) +OBJECTS = $(OBJECTS) \ + $(WORKDIR)\apu_dso.obj \ + $(WORKDIR)\apr_thread_pool.obj \ + $(WORKDIR)\apr_memcache.obj \ + $(WORKDIR)\apr_ldap_rebind.obj \ + $(WORKDIR)\apr_ldap_stub.obj +!ENDIF + HEADERS = \ $(SRCDIR)\include\apu.h \ $(SRCDIR)\include\apu_want.h \ @@ -189,6 +199,9 @@ {$(SRCDIR)\misc}.c{$(WORKDIR)}.obj: $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< +{$(SRCDIR)\memcache}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + {$(SRCDIR)\strmatch}.c{$(WORKDIR)}.obj: $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< Modified: trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor =================================================================== --- trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor 2008-10-09 14:24:37 UTC (rev 1945) +++ trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor 2008-10-12 11:16:44 UTC (rev 1946) @@ -33,7 +33,7 @@ !include <..\..\NMAKEhttpd.inc> LDIRS = /libpath:"$(BUILDLIB)" -LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib ole32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib $(APR) $(APU) $(API) +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib ole32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib wtsapi32.lib $(APR) $(APU) $(API) CFLAGS = $(CFLAGS) -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC -DSTRICT INCLUDES = -I$(SRCDIR) -I$(BUILDINC)