From: Peter van Dijk Date: Tue, 27 Aug 2024 07:50:44 +0000 (+0200) Subject: dnsdist: add configure args to --version output X-Git-Tag: rec-5.2.0-alpha1~124^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c3718fbf7b52bdd2cc2f1b048f80f2b247d004b;p=thirdparty%2Fpdns.git dnsdist: add configure args to --version output --- diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac index 81e39c8bc9..3ae9a5f98f 100644 --- a/pdns/dnsdistdist/configure.ac +++ b/pdns/dnsdistdist/configure.ac @@ -19,6 +19,12 @@ LT_INIT([disable-static]) CFLAGS="-g -O3 -Wall -Wextra -Wshadow -Wno-unused-parameter -fvisibility=hidden $CFLAGS" CXXFLAGS="-g -O3 -Wall -Wextra -Wshadow -Wno-unused-parameter -Wmissing-declarations -Wredundant-decls -fvisibility=hidden $CXXFLAGS" +AC_SUBST([pdns_configure_args], ["$ac_configure_args"]) +AC_DEFINE_UNQUOTED([DNSDIST_CONFIG_ARGS], + ["$pdns_configure_args"], + [pdns configure arguments] +) + PDNS_WITH_LIBSODIUM PDNS_WITH_QUICHE PDNS_CHECK_DNSTAP([auto]) diff --git a/pdns/dnsdistdist/dnsdist.cc b/pdns/dnsdistdist/dnsdist.cc index 4186ac7875..14efcd0326 100644 --- a/pdns/dnsdistdist/dnsdist.cc +++ b/pdns/dnsdistdist/dnsdist.cc @@ -2885,6 +2885,14 @@ static void reportFeatures() cout << "systemd"; #endif cout << endl; +#ifdef DNSDIST_CONFIG_ARGS +#define double_escape(s) #s +#define escape_quotes(s) double_escape(s) + // NOLINTEND(cppcoreguidelines-macro-usage) + cout << "Configured with: " << escape_quotes(DNSDIST_CONFIG_ARGS) << endl; +#undef escape_quotes +#undef double_escape +#endif } static void parseParameters(int argc, char** argv, CommandLineParameters& cmdLine, ComboAddress& clientAddress)