Merge branch 'svn-BETA21' into beta2.2

Conflicts:
	version.m4
	- Reset version.m4 to a more neutral version number

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/base64.h b/base64.h
index a966b2d..968d18d 100644
--- a/base64.h
+++ b/base64.h
@@ -34,7 +34,7 @@
 #ifndef _BASE64_H_
 #define _BASE64_H_
 
-#ifdef ENABLE_HTTP_PROXY
+#if defined(ENABLE_HTTP_PROXY) || defined(ENABLE_PKCS11) || defined(ENABLE_CLIENT_CR)
 
 int base64_encode(const void *data, int size, char **str);
 int base64_decode(const char *str, void *data);