Commit b4fccc1d authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Added SPNEGO to NetWare build.

parent e2be8cee

docs/examples/Makefile.netware

+11 −2
Original line number Diff line number Diff line
@@ -42,6 +42,11 @@ ifndef LIBRTMP_PATH 
LIBRTMP_PATH = ../../../librtmp-2.3

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.

ifndef LIBCARES_PATH

LIBCARES_PATH = ../../ares
@@ -223,7 +228,7 @@ else 
	IMPORTS	= @$(CURL_LIB)/libcurl.imp

endif

ifdef WITH_SSH2

	INCLUDES += -I$(LIBSSH2_PATH)/include

	# INCLUDES += -I$(LIBSSH2_PATH)/include

ifdef LINK_STATIC

	LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)

else
@@ -238,10 +243,14 @@ ifdef LINK_STATIC 
endif

endif

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)/crypto.$(LIBEXT)

	IMPORTS += GetProcessSwitchCount RunningProcess

ifdef WITH_SPNEGO

	# INCLUDES += -I$(FBOPENSSL_PATH)/include

	LDLIBS += $(FBOPENSSL_PATH)/nw/fbopenssl.$(LIBEXT)

endif

else

ifdef WITH_AXTLS

	INCLUDES += -I$(AXTLS_PATH)/inc

lib/Makefile.netware

+12 −0
Original line number Diff line number Diff line
@@ -42,6 +42,11 @@ ifndef LIBRTMP_PATH 
LIBRTMP_PATH = ../../librtmp-2.3

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.

ifndef LIBCARES_PATH

LIBCARES_PATH = ../ares
@@ -241,6 +246,10 @@ ifdef WITH_SSL 
	LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)

	IMPORTS += GetProcessSwitchCount RunningProcess

	INSTDEP += ca-bundle.crt

ifdef WITH_SPNEGO

	INCLUDES += -I$(FBOPENSSL_PATH)/include

	LDLIBS += $(FBOPENSSL_PATH)/nw/fbopenssl.$(LIBEXT)

endif

else

ifdef WITH_AXTLS

	INCLUDES += -I$(AXTLS_PATH)/inc
@@ -621,6 +630,9 @@ ifdef WITH_SSL 
	@echo $(DL)#define HAVE_LIBSSL 1$(DL) >> $@

	@echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@

	@echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@

ifdef WITH_SPNEGO

	@echo $(DL)#define HAVE_SPNEGO 1$(DL) >> $@

endif

else

ifdef WITH_AXTLS

	@echo $(DL)#define USE_AXTLS 1$(DL) >> $@

src/Makefile.netware

+15 −3
Original line number Diff line number Diff line
@@ -42,6 +42,11 @@ ifndef LIBRTMP_PATH 
LIBRTMP_PATH = ../../librtmp-2.3

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.

ifndef LIBCARES_PATH

LIBCARES_PATH = ../ares
@@ -223,7 +228,7 @@ else 
	IMPORTS	= @$(CURL_LIB)/libcurl.imp

endif

ifdef WITH_SSH2

	INCLUDES += -I$(LIBSSH2_PATH)/include

	# INCLUDES += -I$(LIBSSH2_PATH)/include

ifdef LINK_STATIC

	LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)

else
@@ -238,13 +243,17 @@ ifdef LINK_STATIC 
endif

endif

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)/crypto.$(LIBEXT)

	IMPORTS += GetProcessSwitchCount RunningProcess

ifdef WITH_SPNEGO

	# INCLUDES += -I$(FBOPENSSL_PATH)/include

	LDLIBS += $(FBOPENSSL_PATH)/nw/fbopenssl.$(LIBEXT)

endif

else

ifdef WITH_AXTLS

	INCLUDES += -I$(AXTLS_PATH)/inc

	# INCLUDES += -I$(AXTLS_PATH)/inc

ifdef LINK_STATIC

	LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT)

else
@@ -614,6 +623,9 @@ ifdef WITH_SSL 
	@echo $(DL)#define HAVE_LIBSSL 1$(DL) >> $@

	@echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@

	@echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@

ifdef WITH_SPNEGO

	@echo $(DL)#define HAVE_SPNEGO 1$(DL) >> $@

endif

else

ifdef WITH_AXTLS

	@echo $(DL)#define USE_AXTLS 1$(DL) >> $@