diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-17 09:28:03 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-17 09:28:03 +0100 |
| commit | c910bf7cd3c5a7ec079fee08234f51dea0deb576 (patch) | |
| tree | 4f6b6a523afa97e065c3c786e2c6d4ae3a00893f /nx-X11/programs/Xserver | |
| parent | 65deb86f8dab0c88e051b5ac416b7907433aa849 (diff) | |
| parent | 203d97147623b97a48c0f6456cc1de9d8364db03 (diff) | |
| download | nx-libs-c910bf7cd3c5a7ec079fee08234f51dea0deb576.tar.gz nx-libs-c910bf7cd3c5a7ec079fee08234f51dea0deb576.tar.bz2 nx-libs-c910bf7cd3c5a7ec079fee08234f51dea0deb576.zip | |
Merge pull request #3 from sunweaver/feature/nxagent-version-v2
Make nxagent aware of its NX'ish version string (and number).
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Imakefile | 7 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Init.c | 5 | ||||
| l--------- | nx-X11/programs/Xserver/hw/nxagent/VERSION | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile index d812c7f70..6c075fa9f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile +++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile @@ -189,7 +189,12 @@ UPG_DEFINES=-DNXAGENT_UPGRADE UPG_DEFINES= #endif -DEFINES = -g $(OS_DEFINES) $(EXT_DEFINES) $(UPG_DEFINES) \ +#if nxVersion +NX_DEFINES=-DNX_VERSION_CURRENT="$(NX_VERSION_CURRENT)" \ + -DNX_VERSION_CURRENT_STRING="\"$(NX_VERSION_CURRENT_STRING)\"" +#endif + +DEFINES = -g $(OS_DEFINES) $(EXT_DEFINES) $(UPG_DEFINES) $(NX_DEFINES) \ -UXF86VIDMODE -UXFreeXDGA -UXF86MISC -UXF86DRI -UXFree86LOADER \ -DNXAGENT_SERVER \ -DNXAGENT_CONSTRAINCURSOR \ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index 8d4eed2b6..dbc706cfe 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -74,7 +74,8 @@ is" without express or implied warranty. #undef DEBUG #undef DUMP -#define NXAGENT_VERSION "3.5.0" +#define NXAGENT_VERSION NX_VERSION_CURRENT +#define NXAGENT_VERSION_STRING NX_VERSION_CURRENT_STRING /* * ProcVector array defined in tables.c. @@ -226,7 +227,7 @@ void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[]) if (serverGeneration <= 1) { - fprintf(stderr, "\nNXAGENT - Version " NXAGENT_VERSION "\n\n"); + fprintf(stderr, "\nNXAGENT - Version " NXAGENT_VERSION_STRING "\n\n"); fprintf(stderr, "Copyright (C) 2001, 2011 NoMachine.\n"); fprintf(stderr, "See http://www.nomachine.com/ for more information.\n\n"); diff --git a/nx-X11/programs/Xserver/hw/nxagent/VERSION b/nx-X11/programs/Xserver/hw/nxagent/VERSION deleted file mode 120000 index 9ca2cfb9d..000000000 --- a/nx-X11/programs/Xserver/hw/nxagent/VERSION +++ /dev/null @@ -1 +0,0 @@ -../../../../../VERSION
\ No newline at end of file |