Commit 3e4a8cb8 authored by Yang Tse's avatar Yang Tse
Browse files

Fix Use of conditional definition of USE_OPENSSL

parent ad638da2

lib/Makefile.netware

+0 −1
Original line number Diff line number Diff line
@@ -517,7 +517,6 @@ ifdef WITH_ZLIB 
endif

ifdef WITH_SSL

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

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

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

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

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

lib/http_negotiate.c

+10 −6
Original line number Diff line number Diff line
@@ -44,9 +44,13 @@ 


#ifdef HAVE_SPNEGO

#  include <spnegohelp.h>

# if defined(USE_OPENSSL) && !defined(USE_YASSLEMUL)

#  ifdef USE_SSLEAY

#    ifdef USE_OPENSSL

#      include <openssl/objects.h>

#    else

#      include <objects.h>

#    endif

#  else

#    error "Can't compile SPNEGO support without OpenSSL."

#  endif

#endif

src/Makefile.netware

+0 −1
Original line number Diff line number Diff line
@@ -504,7 +504,6 @@ ifdef WITH_ZLIB 
endif

ifdef WITH_SSL

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

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

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

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

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