jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xrdp: print configure options to --version more pretty

Browse Source
This commit is contained in:
Koichiro IWAO 2018-06-26 17:26:32 +09:00
parent dbee05d9ed
commit be05afb30b
No known key found for this signature in database
GPG Key ID: 9F72CDBC01BF10EB
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -397,4 +397,9 @@ echo " exec_prefix $exec_prefix"
echo " libdir $libdir" echo " libdir $libdir"
echo " bindir $bindir" echo " bindir $bindir"
echo " sysconfdir $sysconfdir" echo " sysconfdir $sysconfdir"
echo "#define CONFIGURE_STRING \"$@\"" > configure_params.h
# configure_params.h will be written to the build directory, not the source directory
echo '#define CONFIGURE_STRING \' > ./configure_params.h
./config.status --config | xargs -n 1 | sed -e 's/^/" /' -e 's/$/\\n" \\/' >> ./configure_params.h
echo '""' >> ./configure_params.h

11
xrdp/xrdp.c
View File

@ -56,17 +56,20 @@ print_version(void)
"Neutrino Labs, and all contributors."); "Neutrino Labs, and all contributors.");
g_writeln(" See https://github.com/neutrinolabs/xrdp for more information."); g_writeln(" See https://github.com/neutrinolabs/xrdp for more information.");
g_writeln("%s", ""); g_writeln("%s", "");
#if defined(CONFIGURE_STRING)
g_writeln(" Configure options:");
g_writeln("%s", CONFIGURE_STRING);
#endif
g_writeln(" Compiled with %s", get_openssl_version()); g_writeln(" Compiled with %s", get_openssl_version());
} }
/*****************************************************************************/ /*****************************************************************************/
void void
print_help(void) print_help(void)
{ {
#if defined(CONFIGURE_STRING)
g_writeln("xrdp configure command line parameters [%s]", CONFIGURE_STRING);
g_writeln("%s", "");
#endif
g_writeln("Usage: xrdp [options]"); g_writeln("Usage: xrdp [options]");
g_writeln(" -h, --help show help"); g_writeln(" -h, --help show help");
g_writeln(" -n, --nodaemon don't fork into background"); g_writeln(" -n, --nodaemon don't fork into background");