From: David Sommerseth <davids@redhat.com>
Date: Thu, 26 May 2011 08:16:59 +0000 (+0200)
Subject: Don't define ENABLE_PUSH_PEER_INFO if SSL is not available
X-Git-Tag: v2.2.1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fe914a0ef0424144df3b12de19f2166fc613a0c;p=thirdparty%2Fopenvpn.git

Don't define ENABLE_PUSH_PEER_INFO if SSL is not available

The push_peer_info feature depends on the SSL infrastructure and openvpn
will fail to build if ./configure --disable-crypto --disable-ssl is
used.  The solution is to not define ENABLE_PUSH_PEER_INFO if we don't
have crypto/ssl.

Signed-off-by: David Sommerseth <davids@redhat.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 21fc2edfc49bcc903d5cfb74c1ba2f41ac8771f0)
---

diff --git a/syshead.h b/syshead.h
index 63b82babc..b81ce59a1 100644
--- a/syshead.h
+++ b/syshead.h
@@ -651,6 +651,8 @@ socket_defined (const socket_descriptor_t sd)
 /*
  * Do we support pushing peer info?
  */
+#if defined(USE_CRYPTO) && defined(USE_SSL)
 #define ENABLE_PUSH_PEER_INFO
+#endif
 
 #endif