From ec1b3a44c0653e21dd252e1727ed42f86f0bb0ec Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Fri, 15 Dec 2017 00:48:35 +0100
Subject: Add support for custom version string

Make nxproxy and nxagent print an arbitrary version number by running
make NX_VERSION_CUSTOM="myvers". nxagent and nxproxy will then show
this in addition to the original version number:

NXPROXY - Version myvers (3.5.99.22)
NXAGENT - Version myvers (3.5.99.22)

Fixes ArcticaProject/nx-libs#606
---
 nxcomp/configure.ac |  7 +++++++
 nxcomp/src/Loop.cpp | 13 +++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'nxcomp')

diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index a1839c719..0e17521c3 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -19,6 +19,13 @@ AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-bzip2])
 # Initialize libtool
 AC_PROG_LIBTOOL
 
+# enable this to add the variable to the Makefiles
+#AC_ARG_VAR(NX_VERSION_CUSTOM, [custom version string])
+
+if test "x$NX_VERSION_CUSTOM" != x; then
+    AC_DEFINE_UNQUOTED([NX_VERSION_CUSTOM], ["${NX_VERSION_CUSTOM}"], [user provided custom version string])
+fi
+
 COMP_VERSION=nxcomp_version
 AC_SUBST([COMP_VERSION])
 
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index bb8a89d64..eb7373f9f 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -13308,13 +13308,18 @@ void PrintConnectionInfo()
 
 void PrintVersionInfo()
 {
-  cerr << "NXPROXY - " << "Version "
+  cerr << "NXPROXY - Version "
+#ifdef NX_VERSION_CUSTOM
+       << NX_VERSION_CUSTOM << " ("
+#endif
        << control -> LocalVersionMajor << "."
        << control -> LocalVersionMinor << "."
        << control -> LocalVersionPatch << "."
-       << control -> LocalVersionMaintenancePatch;
-
-  cerr << endl;
+       << control -> LocalVersionMaintenancePatch
+#ifdef NX_VERSION_CUSTOM
+       << ")"
+#endif
+       << endl;
 }
 
 void PrintCopyrightInfo()
-- 
cgit v1.2.3