aboutsummaryrefslogtreecommitdiffstats
path: root/common/rfb/Security.cxx
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2010-04-28 15:45:53 +0000
committerAdam Tkac <atkac@redhat.com>2010-04-28 15:45:53 +0000
commitdf7997021e0f7ad99efa7f015b5c34f289538cfb (patch)
treede0a977c008c21cd734d86938501322a03c86e14 /common/rfb/Security.cxx
parent64add650aa34a7e9f335a32994575036bb0e77a5 (diff)
downloadtigervnc-df7997021e0f7ad99efa7f015b5c34f289538cfb.tar.gz
tigervnc-df7997021e0f7ad99efa7f015b5c34f289538cfb.zip
[Bugfix] Compile VeNCrypt extension only when gnutls is enabled and available.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4049 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/rfb/Security.cxx')
-rw-r--r--common/rfb/Security.cxx12
1 files changed, 12 insertions, 0 deletions
diff --git a/common/rfb/Security.cxx b/common/rfb/Security.cxx
index eb99f7c5..7049439d 100644
--- a/common/rfb/Security.cxx
+++ b/common/rfb/Security.cxx
@@ -1,4 +1,5 @@
/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ * Copyright (C) 2010 TigerVNC Team
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -15,6 +16,11 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <assert.h>
#include <stdlib.h>
#include <string.h>
@@ -29,7 +35,9 @@
#include <rfb/Security.h>
#include <rfb/SSecurityNone.h>
#include <rfb/SSecurityVncAuth.h>
+#ifdef HAVE_GNUTLS
#include <rfb/SSecurityVeNCrypt.h>
+#endif
#include <rfb/util.h>
using namespace rdr;
@@ -84,7 +92,9 @@ SSecurity* Security::GetSSecurity(U8 secType)
switch (secType) {
case secTypeNone: return new SSecurityNone();
case secTypeVncAuth: return new SSecurityVncAuth();
+#ifdef HAVE_GNUTLS
case secTypeVeNCrypt: return new SSecurityVeNCrypt();
+#endif
}
bail:
@@ -101,7 +111,9 @@ CSecurity* Security::GetCSecurity(U8 secType)
switch (secType) {
case secTypeNone: return new CSecurityNone();
case secTypeVncAuth: return new CSecurityVncAuth();
+#ifdef HAVE_GNUTLS
case secTypeVeNCrypt: return new CSecurityVeNCrypt();
+#endif
}
bail: