Fixed some minor build issues with PKCS11 patch:

"make dist" wasn't building correct tarball.
Some ./configure --enable/--disable options
were broken. Renamed pkcs11 directory to
pkcs11-headers to work around automake issue.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@626 e7ae566f-a301-0410-adde-c780ea21d3b5

5 files changed, 6 insertions, 3 deletions

diff --git a/pkcs11/pkcs11.h b/pkcs11-headers/pkcs11.h
index 6c61220..6c61220 100644
--- a/pkcs11/pkcs11.h
+++ b/pkcs11-headers/pkcs11.h
diff --git a/pkcs11/pkcs11f.h b/pkcs11-headers/pkcs11f.h
index a479384..a479384 100644
--- a/pkcs11/pkcs11f.h
+++ b/pkcs11-headers/pkcs11f.h
diff --git a/pkcs11/pkcs11t.h b/pkcs11-headers/pkcs11t.h
index b1a231a..b1a231a 100644
--- a/pkcs11/pkcs11t.h
+++ b/pkcs11-headers/pkcs11t.h
diff --git a/pkcs11.c b/pkcs11.c
index 7352e8f..cee178e 100644
--- a/pkcs11.c
+++ b/pkcs11.c
@@ -34,9 +34,10 @@
 #include "config.h"
 #endif
 
-#if defined(USE_CRYPTO) && defined(USE_SSL) && defined(ENABLE_PKCS11)
-
 #include "syshead.h"
+
+#if defined(ENABLE_PKCS11)
+
 #include "error.h"
 #include "misc.h"
 #include "ssl.h"
diff --git a/pkcs11.h b/pkcs11.h
index 7f44e1b..fdb1b91 100644
--- a/pkcs11.h
+++ b/pkcs11.h
@@ -25,7 +25,9 @@
 #ifndef OPENVPN_PKCS11_H
 #define OPENVPN_PKCS11_H
 
-#if defined(USE_CRYPTO) && defined(USE_SSL) && defined(ENABLE_PKCS11)
+#if defined(ENABLE_PKCS11)
+
+#include <openssl/ssl.h>
 
 int
 SSL_CTX_use_pkcs11 (