xrdp: unify inconsistent mixed use of
* configure params * configure options * configure string
This commit is contained in:
parent
be05afb30b
commit
c0c7c3f106
@ -67,4 +67,4 @@ SUBDIRS = \
|
||||
$(XRDPVRDIR)
|
||||
|
||||
distclean-local:
|
||||
-rm -f configure_params.h
|
||||
-rm -f xrdp_configure_options.h
|
||||
|
@ -398,8 +398,8 @@ echo " libdir $libdir"
|
||||
echo " bindir $bindir"
|
||||
echo " sysconfdir $sysconfdir"
|
||||
|
||||
# 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
|
||||
# xrdp_configure_options.h will be written to the build directory, not the source directory
|
||||
echo '#define XRDP_CONFIGURE_OPTIONS \' > ./xrdp_configure_options.h
|
||||
./config.status --config | xargs -n 1 | sed -e 's/^/" /' -e 's/$/\\n" \\/' >> ./xrdp_configure_options.h
|
||||
echo '""' >> ./xrdp_configure_options.h
|
||||
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
#include "xrdp.h"
|
||||
#include "log.h"
|
||||
#include "configure_params.h"
|
||||
#include "xrdp_configure_options.h"
|
||||
|
||||
#if !defined(PACKAGE_VERSION)
|
||||
#define PACKAGE_VERSION "???"
|
||||
@ -57,9 +57,9 @@ print_version(void)
|
||||
g_writeln(" See https://github.com/neutrinolabs/xrdp for more information.");
|
||||
g_writeln("%s", "");
|
||||
|
||||
#if defined(CONFIGURE_STRING)
|
||||
#if defined(XRDP_CONFIGURE_OPTIONS)
|
||||
g_writeln(" Configure options:");
|
||||
g_writeln("%s", CONFIGURE_STRING);
|
||||
g_writeln("%s", XRDP_CONFIGURE_OPTIONS);
|
||||
#endif
|
||||
|
||||
g_writeln(" Compiled with %s", get_openssl_version());
|
||||
|
Loading…
Reference in New Issue
Block a user