Fix Use of conditional definition of USE_OPENSSL

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 30a2b563acee6ade6f0f39708c74a28d2637e863..b52ac01284221022fddf1eb4a58ce927677dda31 100644 (file)
--- 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 9644a751c74556d3d4db22d8ab0452bc1a8af0e6..d47c9aecd9cee78a7f0fdd85bb3974c52fe228c5 100644 (file)
--- 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 */

diff --git a/src/Makefile.netware b/src/Makefile.netware
index 6b4c7a885b0a357430188615ce0e301c945baa64..47a7cada98cc24ae135ce8142826332e48453e75 100644 (file)
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -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) >> $@