Fix Use of conditional definition of USE_OPENSSL

This commit is contained in:
Yang Tse 2008-08-16 03:27:07 +00:00
parent ad638da2c2
commit 3e4a8cb800
3 changed files with 10 additions and 8 deletions

View File

@ -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) >> $@

View File

@ -43,12 +43,16 @@
#include "memory.h"
#ifdef HAVE_SPNEGO
# include <spnegohelp.h>
# if defined(USE_OPENSSL) && !defined(USE_YASSLEMUL)
# include <openssl/objects.h>
# else
# error "Can't compile SPNEGO support without OpenSSL."
# endif
# include <spnegohelp.h>
# 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
#define _MPRINTF_REPLACE /* use our functions only */

View File

@ -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) >> $@