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 /nxproxy | |
| 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 'nxproxy')
| -rw-r--r-- | nxproxy/configure.ac | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/nxproxy/configure.ac b/nxproxy/configure.ac index 2ca64f61e..1345e32a3 100644 --- a/nxproxy/configure.ac +++ b/nxproxy/configure.ac @@ -8,6 +8,7 @@ m4_define([nxproxy_version], m4_esyscmd([tr -d '\n' < VERSION])) AC_PREREQ(2.60) AC_INIT([NX Proxy], [nxproxy_version], [https://github.com/ArcticaProject/nx-libs/issues]) + AC_CONFIG_AUX_DIR([build-aux]) AC_PROG_CC AC_CONFIG_SRCDIR([Makefile.am]) @@ -19,6 +20,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 + PROXY_VERSION=nxproxy_version AC_SUBST([PROXY_VERSION]) |