diff options
| author | bnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68> | 2005-04-14 23:38:52 +0000 |
|---|---|---|
| committer | bnicholes <bnicholes@13f79535-47bb-0310-9956-ffa450edef68> | 2005-04-14 23:38:52 +0000 |
| commit | d3c5b967f137ff47b51fb3ece755066c768038e9 (patch) | |
| tree | 4728da134aaf0111cf5f5937eeb41d8ca5273dea /NWGNUmakefile | |
| parent | 1aae97b6804314f49024d41e0aea57a4085b798c (diff) | |
| download | libapr-d3c5b967f137ff47b51fb3ece755066c768038e9.tar.gz | |
Allow Apache on NetWare to build using either the standard socket libraries or the Winsock libraries.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@161365 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'NWGNUmakefile')
| -rw-r--r-- | NWGNUmakefile | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index ed11cad61..8bc6e2fdd 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -188,6 +188,7 @@ FILES_nlm_libs = \ libcpre.o \ $(APRLIB) \ $(APRUTLIB) \ + $(APULDAPLIB) \ $(XMLLIB) \ $(EOLIST) @@ -197,9 +198,14 @@ FILES_nlm_libs = \ # FILES_nlm_modules = \ Libc \ - ws2_32 \ $(EOLIST) - + +# Include the Winsock libraries if Winsock is being used +ifndef USE_STDSOCKETS +FILES_nlm_modules += ws2_32 \ + $(EOLIST) +endif + #If the LDAP support is defined then add the auto-load modules ifneq "$(LDAPSDK)" "" FILES_nlm_modules += \ @@ -208,7 +214,6 @@ FILES_nlm_modules += \ lldapx \ $(EOLIST) endif - # # If the nlm has a msg file, put it's path here @@ -230,11 +235,17 @@ FILE_nlm_copyright = # FILES_nlm_Ximports = \ @libc.imp \ - @ws2nlm.imp \ @netware.imp \ + $(EOLIST) + +# Include the Winsock imports if Winsock is being used +ifndef USE_STDSOCKETS +FILES_nlm_Ximports += \ + @ws2nlm.imp \ WSAStartupRTags \ WSACleanupRTag \ $(EOLIST) +endif #If the LDAP support is defined then add the imports ifneq "$(LDAPSDK)" "" @@ -370,8 +381,15 @@ endif vpath %.c atomic/netware:strings:tables:passwd:lib:time/unix vpath %.c file_io/unix:locks/netware:misc/netware:misc/unix:threadproc/netware -vpath %.c dso/netware:memory/unix:mmap/unix:user/netware:network_io/win32 -vpath %.c network_io/unix:poll/unix:shmem\unix:support/unix:random/unix +vpath %.c poll/unix:shmem\unix:support/unix:random/unix +vpath %.c dso/netware:memory/unix:mmap/unix:user/netware + +# Use the win32 network_io if Winsock is being used +ifdef USE_STDSOCKETS +vpath %.c network_io/unix +else +vpath %.c network_io/win32:network_io/unix +endif $(OBJDIR)/%.o: file_io/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt @echo Compiling $< |