aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-08-16 03:27:07 +0000
committerYang Tse <yangsita@gmail.com>2008-08-16 03:27:07 +0000
commit3e4a8cb800983ee276bbc118dcd5749fc852401a (patch)
tree257ded6a740c10fe128959e1c7f298d613542907 /lib
parentad638da2c29a61babb50fdced0333393416a199a (diff)
Fix Use of conditional definition of USE_OPENSSL
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.netware1
-rw-r--r--lib/http_negotiate.c16
2 files changed, 10 insertions, 7 deletions
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 30a2b563a..b52ac0128 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -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) >> $@
diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c
index 9644a751c..d47c9aecd 100644
--- a/lib/http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -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 */