diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 23:21:39 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 23:21:39 +0100 |
| commit | 46ef20bdb97bc134bb855f8604828ec314716a32 (patch) | |
| tree | d9170b2bd676cad47a9578e7bed01767af1fc0cc /nxcomp | |
| parent | 04962efa95a41cd6f665ebb110a7ce07d99a4554 (diff) | |
| parent | ec1b3a44c0653e21dd252e1727ed42f86f0bb0ec (diff) | |
| download | nx-libs-46ef20bdb97bc134bb855f8604828ec314716a32.tar.gz nx-libs-46ef20bdb97bc134bb855f8604828ec314716a32.tar.bz2 nx-libs-46ef20bdb97bc134bb855f8604828ec314716a32.zip | |
Merge branch 'uli42-pr/custom_version_string' into 3.6.x
Attributes GH PR #607: https://github.com/ArcticaProject/nx-libs/pull/607
Diffstat (limited to 'nxcomp')
| -rw-r--r-- | nxcomp/configure.ac | 7 | ||||
| -rw-r--r-- | nxcomp/src/Loop.cpp | 13 |
2 files changed, 16 insertions, 4 deletions
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() |