Fix build failure on systems without GnuTLS v3

Oops. Including header files which are only available in GnuTLS v3 is
probably not cunning, if we're building with OpenSSL or with GnuTLS v2.

Pointed out by Stuart Henderson (thanks).

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/dtls.c b/dtls.c
index 190d57884b7ae67df43fec3531b30c0942d2546b..9739b87ccd3b5717a49c6f9f3e9889d4f1b0856f 100644 (file)
--- a/dtls.c
+++ b/dtls.c
@@ -36,8 +36,6 @@
 
 #include "openconnect-internal.h"
 
-#include <gnutls/dtls.h>
-
 static unsigned char nybble(unsigned char n)
 {
        if      (n >= '0' && n <= '9') return n - '0';
@@ -334,6 +332,8 @@ int dtls_try_handshake(struct openconnect_info *vpninfo)
 }
 
 #elif defined (DTLS_GNUTLS)
+#include <gnutls/dtls.h>
+
 struct {
        const char *name;
        gnutls_cipher_algorithm_t cipher;

diff --git a/www/changelog.xml b/www/changelog.xml
index 928a828d842b76e3d2caf44b00985a33460a0925..407f4492f273bcd0cc467b4fafb3bb545140be50 100644 (file)
--- a/www/changelog.xml
+++ b/www/changelog.xml
@@ -17,7 +17,7 @@
 <ul>
    <li><b>OpenConnect HEAD</b>
      <ul>
-       <li><i>No changelog entries yet</i></li>
+       <li>Fix build failure due to unconditional inclusion of <tt>&amp;lt;gnutls/dtls.h&amp;gt;</tt>.</li>
      </ul><br/>
   </li>
   <li><b><a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-4.01.tar.gz">OpenConnect v4.01</a></b>