diff options
| author | Bradley Nicholes <bnicholes@apache.org> | 2005-04-14 23:42:21 +0000 |
|---|---|---|
| committer | Bradley Nicholes <bnicholes@apache.org> | 2005-04-14 23:42:21 +0000 |
| commit | 6905d3d9d5da41176e547742c8c04d434cde2056 (patch) | |
| tree | 36215a9131a7eb10cfa3907b4dbb6d4a155465b5 /NWGNUmakefile | |
| parent | 8fa473da4301bfc766fcf3908f336b7c1e0dee8a (diff) | |
| download | httpd-6905d3d9d5da41176e547742c8c04d434cde2056.tar.gz | |
Allow httpd on NetWare to build using either the standard socket libraries or the Winsock libraries.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161368 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'NWGNUmakefile')
| -rw-r--r-- | NWGNUmakefile | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index ca7c3676e9..3ae56b9dd9 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -216,7 +216,6 @@ FILES_nlm_objs = \ $(OBJDIR)/mod_mime.o \ $(OBJDIR)/mod_negotiation.o \ $(OBJDIR)/mod_netware.o \ - $(OBJDIR)/mod_nw_ssl.o \ $(OBJDIR)/mod_setenvif.o \ $(OBJDIR)/mod_so.o \ $(OBJDIR)/modules.o \ @@ -241,6 +240,12 @@ FILES_nlm_objs = \ $(OBJDIR)/vhost.o \ $(EOLIST) +# Build in mod_nw_ssl if Winsock is being used +ifndef USE_STDSOCKETS +FILES_nlm_objs += $(OBJDIR)/mod_nw_ssl.o \ + $(EOLIST) +endif + # # These are the LIB files needed to create the NLM target above. # These will be added as a library command in the link.opt file. @@ -280,9 +285,14 @@ FILES_nlm_Ximports = \ @netware.imp \ @$(APR)/aprlib.imp \ @libc.imp \ - @ws2nlm.imp \ GetCurrentAddressSpace \ $(EOLIST) + +# Build in mod_nw_ssl if Winsock is being used +ifndef USE_STDSOCKETS +FILES_nlm_Ximports += @ws2nlm.imp \ + $(EOLIST) +endif # # Any symbols exported to here |