Uhm, is there an unresolved conflict in the first file? -Stefan
PS. You know, it *would* actually be easier if you had commit access... ;-) > Am 11.02.2016 um 03:09 schrieb NormW <no...@gknw.net>: > > G/A Stefan, > My BBAADD. Until recently /http2 was home only to mod_http2, and to keep > things automatic my NWGNUmakefile in there used a wildcard *.c to get the > list of object files to build there. When the compile failed due to added .c > files I made a few tweaks to the NWGNU and it all linked without issue again > so I forwarded the small tweaks. Closer reading of the list and the added .c > revealed there are (at least) two modules now in /http2. This necessitated a > change of the NWGNU to use a specified list of .c for a start, and removal of > a couple of the patch lines I'd recently sent. Because other modules will be > sharing the same dir I've renamed the original NWNUmakefile to NWGNUmod_http2 > and there is now a new NWGNUmakefile whose only job is to call the other > NWGNU files that will eventually exist in the dir. (If all this sounds > confusing it probably is, but by way of example see /proxy dir and note a > NWGNUmakefile that contains a list of executables to build.) > > If we are still speaking after explaining all that, the new files are > attached, thus: > : NWGUmod_http2 which now has the list of /http2 files to build mod_http2; > > : NWGNUmakefile which, FTM, has a list of modules to build, but I won't try > to explain why the list has a double entry if there is only one (so far) to > build. > > Hopefully I will eventually work out a process to do away with this > 'additional' NWGNUmakefile, which would allow removal of quite a few from the > source tree. > Apologies for the bother, > Norm > > On 10/02/2016 10:34 PM, Stefan Eissing wrote: >> Applied in r1729583. Thanks! >> >>> Am 08.02.2016 um 23:07 schrieb NormW <no...@gknw.net>: > > >>> G/M, >>> Recent additions to http-trunk/modules/http2 require the attached apatch to >>> the http2 NetWare build file: >>>> Index: modules/http2/NWGNUmakefile >>>> =================================================================== >>>> --- modules/http2/NWGNUmakefile (revision 1729251) >>>> +++ modules/http2/NWGNUmakefile (working copy) >>>> @@ -34,6 +34,8 @@ >>>> $(NGH2SRC)/lib/ \ >>>> $(NGH2SRC)/lib/includes \ >>>> $(SERVER)/mpm/NetWare \ >>>> + $(STDMOD)/proxy \ >>>> + $(STDMOD)/ssl \ >>>> $(NWOS) \ >>>> $(EOLIST) >>>> >>>> @@ -55,6 +57,7 @@ >>>> # >>>> XLFLAGS += \ >>>> -L$(OBJDIR) \ >>>> + -L../proxy \ >>>> $(EOLIST) >>>> >>>> # >>>> @@ -224,6 +227,7 @@ >>>> @libc.imp \ >>>> @aprlib.imp \ >>>> @httpd.imp \ >>>> + @mod_proxy.imp \ >>>> $(EOLIST) >>>> >>>> # >>> >>> The first 2 extra lines allow the compiler to find extra headers, the 3rd >>> allows the linker to locate mod_proxy.imp. >>> >>> Please review and apply this if it seems reasonable. >>> >>> Norm >>> <htttp2_gets_a_proxy.diff> >> > > <NWGNUmakefile.txt><NWGNUmod_http2.txt>
