mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-02-23 15:10:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added SPNEGO to NetWare build.

Browse Source
This commit is contained in:
Guenter Knauf 2011-09-27 16:01:36 +02:00
parent e2be8ceed9
commit b4fccc1d8e
3 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docs/examples/Makefile.netware
View File

@ -42,6 +42,11 @@ ifndef LIBRTMP_PATH
LIBRTMP_PATH = ../../../librtmp-2.3 LIBRTMP_PATH = ../../../librtmp-2.3
endif endif
# Edit the path below to point to the base of your fbopenssl package.
ifndef FBOPENSSL_PATH
FBOPENSSL_PATH = ../../fbopenssl-0.4
endif
# Edit the path below to point to the base of your c-ares package. # Edit the path below to point to the base of your c-ares package.
ifndef LIBCARES_PATH ifndef LIBCARES_PATH
LIBCARES_PATH = ../../ares LIBCARES_PATH = ../../ares
@ -223,7 +228,7 @@ else
IMPORTS = @$(CURL_LIB)/libcurl.imp IMPORTS = @$(CURL_LIB)/libcurl.imp
endif endif
ifdef WITH_SSH2 ifdef WITH_SSH2
INCLUDES += -I$(LIBSSH2_PATH)/include # INCLUDES += -I$(LIBSSH2_PATH)/include
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT) LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)
else else
@ -238,10 +243,14 @@ ifdef LINK_STATIC
endif endif
endif endif
ifdef WITH_SSL ifdef WITH_SSL
# INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L) INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT) LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT) LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
IMPORTS += GetProcessSwitchCount RunningProcess IMPORTS += GetProcessSwitchCount RunningProcess
ifdef WITH_SPNEGO
# INCLUDES += -I$(FBOPENSSL_PATH)/include
LDLIBS += $(FBOPENSSL_PATH)/nw/fbopenssl.$(LIBEXT)
endif
else else
ifdef WITH_AXTLS ifdef WITH_AXTLS
INCLUDES += -I$(AXTLS_PATH)/inc INCLUDES += -I$(AXTLS_PATH)/inc

12
lib/Makefile.netware
View File

@ -42,6 +42,11 @@ ifndef LIBRTMP_PATH
LIBRTMP_PATH = ../../librtmp-2.3 LIBRTMP_PATH = ../../librtmp-2.3
endif endif
# Edit the path below to point to the base of your fbopenssl package.
ifndef FBOPENSSL_PATH
FBOPENSSL_PATH = ../../fbopenssl-0.4
endif
# Edit the path below to point to the base of your c-ares package. # Edit the path below to point to the base of your c-ares package.
ifndef LIBCARES_PATH ifndef LIBCARES_PATH
LIBCARES_PATH = ../ares LIBCARES_PATH = ../ares
@ -241,6 +246,10 @@ ifdef WITH_SSL
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT) LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
IMPORTS += GetProcessSwitchCount RunningProcess IMPORTS += GetProcessSwitchCount RunningProcess
INSTDEP += ca-bundle.crt INSTDEP += ca-bundle.crt
ifdef WITH_SPNEGO
INCLUDES += -I$(FBOPENSSL_PATH)/include
LDLIBS += $(FBOPENSSL_PATH)/nw/fbopenssl.$(LIBEXT)
endif
else else
ifdef WITH_AXTLS ifdef WITH_AXTLS
INCLUDES += -I$(AXTLS_PATH)/inc INCLUDES += -I$(AXTLS_PATH)/inc
@ -621,6 +630,9 @@ ifdef WITH_SSL
@echo $(DL)#define HAVE_LIBSSL 1$(DL) >> $@ @echo $(DL)#define HAVE_LIBSSL 1$(DL) >> $@
@echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@ @echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@
@echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@ @echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@
ifdef WITH_SPNEGO
@echo $(DL)#define HAVE_SPNEGO 1$(DL) >> $@
endif
else else
ifdef WITH_AXTLS ifdef WITH_AXTLS
@echo $(DL)#define USE_AXTLS 1$(DL) >> $@ @echo $(DL)#define USE_AXTLS 1$(DL) >> $@

18
src/Makefile.netware
View File

@ -42,6 +42,11 @@ ifndef LIBRTMP_PATH
LIBRTMP_PATH = ../../librtmp-2.3 LIBRTMP_PATH = ../../librtmp-2.3
endif endif
# Edit the path below to point to the base of your fbopenssl package.
ifndef FBOPENSSL_PATH
FBOPENSSL_PATH = ../../fbopenssl-0.4
endif
# Edit the path below to point to the base of your c-ares package. # Edit the path below to point to the base of your c-ares package.
ifndef LIBCARES_PATH ifndef LIBCARES_PATH
LIBCARES_PATH = ../ares LIBCARES_PATH = ../ares
@ -223,7 +228,7 @@ else
IMPORTS = @$(CURL_LIB)/libcurl.imp IMPORTS = @$(CURL_LIB)/libcurl.imp
endif endif
ifdef WITH_SSH2 ifdef WITH_SSH2
INCLUDES += -I$(LIBSSH2_PATH)/include # INCLUDES += -I$(LIBSSH2_PATH)/include
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT) LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)
else else
@ -238,13 +243,17 @@ ifdef LINK_STATIC
endif endif
endif endif
ifdef WITH_SSL ifdef WITH_SSL
INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L) # INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT) LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT) LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
IMPORTS += GetProcessSwitchCount RunningProcess IMPORTS += GetProcessSwitchCount RunningProcess
ifdef WITH_SPNEGO
# INCLUDES += -I$(FBOPENSSL_PATH)/include
LDLIBS += $(FBOPENSSL_PATH)/nw/fbopenssl.$(LIBEXT)
endif
else else
ifdef WITH_AXTLS ifdef WITH_AXTLS
INCLUDES += -I$(AXTLS_PATH)/inc # INCLUDES += -I$(AXTLS_PATH)/inc
ifdef LINK_STATIC ifdef LINK_STATIC
LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT) LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT)
else else
@ -614,6 +623,9 @@ ifdef WITH_SSL
@echo $(DL)#define HAVE_LIBSSL 1$(DL) >> $@ @echo $(DL)#define HAVE_LIBSSL 1$(DL) >> $@
@echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@ @echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@
@echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@ @echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@
ifdef WITH_SPNEGO
@echo $(DL)#define HAVE_SPNEGO 1$(DL) >> $@
endif
else else
ifdef WITH_AXTLS ifdef WITH_AXTLS
@echo $(DL)#define USE_AXTLS 1$(DL) >> $@ @echo $(DL)#define USE_AXTLS 1$(DL) >> $@