Author: mladen.turk(a)jboss.com Date: 2011-01-11 04:17:16 -0500 (Tue, 11 Jan 2011) New Revision: 2709 Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu Log: Fix newer expat builds on win32 Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu =================================================================== --- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu 2011-01-10 17:28:53 UTC (rev 2708) +++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEapu 2011-01-11 09:17:16 UTC (rev 2709) @@ -158,6 +158,7 @@ $(SRCDIR)\include\private\apu_config.h \ $(SRCDIR)\include\private\apu_select_dbm.h \ $(SRCDIR)\xml\expat\lib\config.h \ + $(SRCDIR)\xml\expat\lib\expat_config.h \ $(SRCDIR)\xml\expat\lib\expat.h !IF "$(TARGET)" == "DLL" @@ -188,6 +189,9 @@ $(SRCDIR)\xml\expat\lib\config.h : @copy /Y $(SRCDIR)\xml\expat\lib\winconfig.h $@ >NUL +$(SRCDIR)\xml\expat\lib\expat_config.h : + @copy /Y $(SRCDIR)\xml\expat\lib\winconfig.h $@ >NUL + {$(SRCDIR)\buckets}.c{$(WORKDIR)}.obj: $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< @@ -231,7 +235,7 @@ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< {$(SRCDIR)\xml\expat\lib}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + $(CC) $(CFLAGS) -DHAVE_EXPAT_CONFIG_H $(INCLUDES) $(PDBFLAGS) $< $(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\private\*.h