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 /build | |
| 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 'build')
| -rw-r--r-- | build/NWGNUenvironment.inc | 9 | ||||
| -rw-r--r-- | build/NWGNUmakefile | 2 | ||||
| -rw-r--r-- | build/NWGNUtail.inc | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index c6b860afb..ada821715 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -116,6 +116,9 @@ NOVI = $(NOVELLLIBC)\imports INCDIRS = $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks;$(NOVELLLIBC)\include\winsock; DEFINES = -DNETWARE +ifndef USE_STDSOCKETS +DEFINES += -DUSE_WINSOCK +endif # # MetroWerks static Libraries @@ -262,10 +265,11 @@ endif # Common directories # -APR = $(APR_WORK) +APR = $(APR_WORK) APRTEST = $(APR_WORK)/test APRUTIL = $(APU_WORK) -XML = $(APRUTIL)/xml +APULDAP = $(APU_WORK)/ldap +XML = $(APRUTIL)/xml # # Internal Libraries @@ -273,6 +277,7 @@ XML = $(APRUTIL)/xml APRLIB = $(APR)/$(OBJDIR)/aprlib.lib APRUTLIB = $(APRUTIL)/$(OBJDIR)/aprutil.lib +APULDAPLIB = $(APULDAP)/$(OBJDIR)/apuldap.lib XMLLIB = $(XML)/$(OBJDIR)/xmllib.lib # diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index 6a003ab65..6f9b32dd0 100644 --- a/build/NWGNUmakefile +++ b/build/NWGNUmakefile @@ -42,7 +42,7 @@ $(NLM_NAME)_cc.opt : NWGNUmakefile $(APR_WORK)\build\NWGNUenvironment.inc $(APR_ @echo -EP >> $@ @echo -nosyspath >> $@ @echo -w nocmdline >> $@ - @echo -DNETWARE >> $@ + @echo $(DEFINES) -DGENEXPORTS >> $@ @echo -I$(APR)\include >> $@ @echo -I$(APR)\include\arch\netware >> $@ @echo -I$(APR)\include\arch\unix >> $@ diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc index 6ac21b90b..b2574ec0c 100644 --- a/build/NWGNUtail.inc +++ b/build/NWGNUtail.inc @@ -234,6 +234,7 @@ else endif @echo -l $(APR)/$(OBJDIR) >> $@ @echo -l $(APRUTIL)/$(OBJDIR) >> $@ + @echo -l $(APULDAP)/$(OBJDIR) >> $@ @echo -l $(XML)/$(OBJDIR) >> $@ @echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime" >> $@ @echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++" >> $@ |