Reaction to a patch sent by Jan Willies for an other problem withcvs-commit-370

tntnet version string. Jan's patch resolved the immediate problem with
regard to the updated version but was not backwards compatible for older
tntnet version.
My changes to the code adressed that problem and added an enhancement
how to deal with that problem in the future.

1 files changed, 4 insertions, 6 deletions

diff --git a/setup.h b/setup.h
index dd315c1..498540e 100644
--- a/setup.h
+++ b/setup.h
@@ -6,6 +6,7 @@
 #include <numeric>
 #include <string>
 #include "live.h"
+#include "tntfeatures.h"
 #include <vdr/menuitems.h>
 
 #define LIVEVERSION "0.2.0"
@@ -14,9 +15,6 @@
 
 namespace vdrlive {
 
-// SSL-Support works from tntnet version 1.6.1 onwards.
-#define TNTSSLSUPPORT	TNTVERSION >= 1610
-
 // forward declaration, see below
 class cMenuSetupLive;
 
@@ -31,7 +29,7 @@ class Setup
 
 		// commandline
 		int GetServerPort() const { return m_serverPort; }
-#if TNTSSLSUPPORT
+#if TNT_SSL_SUPPORT
 		int GetServerSslPort() const { return m_serverSslPort; }
 		std::string GetServerSslCert() const { return m_serverSslCert; }
 		std::string GetServerSslKey() const { return m_serverSslKey; }
@@ -104,7 +102,7 @@ class Setup
 		mutable std::string m_helpString;
 		// commandline options
 		int m_serverPort;
-#if TNTSSLSUPPORT
+#if TNT_SSL_SUPPORT
 		int m_serverSslPort;
 		std::string m_serverSslCert;
 		std::string m_serverSslKey;
@@ -138,7 +136,7 @@ class Setup
 
 		bool CheckServerPort();
 		bool CheckServerIps();
-#if TNTSSLSUPPORT
+#if TNT_SSL_SUPPORT
 		bool CheckServerSslPort();
 #endif
 };