Added SPNEGO to NetWare build.

diff --git a/docs/examples/Makefile.netware b/docs/examples/Makefile.netware
index 2f3157d1a5c019c8003b8231a3be1ad9f7de4a78..fdea6b81bf0d1170d57285cd1d0dff89a5ac1d4f 100644 (file)
--- a/docs/examples/Makefile.netware
+++ b/docs/examples/Makefile.netware
@@ -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

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index ed1c7a3e4dffd9df279280c4033143a7bd2362ed..43fae2e7a385a527e0806265ce8ee0e2577eb056 100644 (file)
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -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) >> $@

diff --git a/src/Makefile.netware b/src/Makefile.netware
index c2f4ad063795ca678927158c0ac4db845f871301..8e66f791921185447303b744aca1df8541f9c1bb 100644 (file)
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -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) >> $@