[#3731] Addressed comments

diff --git a/config-report.sh.in b/config-report.sh.in
index 622f34793a04b574ac89cc35d32273f9b1a50be5..4e42ba19562fe4d0e6559ec78bd0f4a16d7fb19b 100755 (executable)
--- a/config-report.sh.in
+++ b/config-report.sh.in
@@ -42,8 +42,7 @@ Python:
 
 Boost:             @BOOST_VERSION@
 
-@CRYPTO_NAME@:
-  VERSION:         @CRYPTO_VERSION@
+@CRYPTO_NAME@:@SPACES@@CRYPTO_VERSION@
 
 Log4cplus:         @LOG4CPLUS_VERSION@
 
@@ -111,7 +110,8 @@ fi
 
 add_to_report '
 Developer:
-  Tests:            @TESTS_ENABLED@
-  Fuzzing:          @FUZZ_ENABLED@
-  AFL:              @HAVE_AFL@
+  Tests:           @TESTS_ENABLED@
+  Fuzzing:         @FUZZ_ENABLED@
+  Valgrind:        @VALGRIND@
+  AFL:             @HAVE_AFL@
 '

diff --git a/meson.build b/meson.build
index 30dcfd5d2a5d6f211e13fced8eb3851679d67265..f1c8c5ae5741cf1d9bd008b50d48cbbe88687583 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -539,6 +539,7 @@ if result.returncode() == 0
 else
     report_conf_data.set('CXX_VERSION', 'unknown')
 endif
+# The required keyword in cpp.run() is an 1.5.0 feature.
 result = cpp.run(
     fs.read('compiler-checks/get-cpp-standard.cc'),
     name: 'Get cpp standard',
@@ -566,6 +567,7 @@ else
 endif
 if CRYPTO_DEP.name() == botan.name()
     report_conf_data.set('CRYPTO_NAME', 'Botan')
+    report_conf_data.set('SPACES', '             ')
     result = cpp.run(
         fs.read('compiler-checks/get-botan-version.cc'),
         name: 'Get Botan version',
@@ -582,6 +584,7 @@ if CRYPTO_DEP.name() == botan.name()
     report_conf_data.set('CRYPTO_VERSION', version)
 elif CRYPTO_DEP.name() == openssl.name()
     report_conf_data.set('CRYPTO_NAME', 'OpenSSL')
+    report_conf_data.set('SPACES', '           ')
     result = cpp.run(
         fs.read('compiler-checks/get-openssl-version.cc'),
         name: 'Get OpenSSL version',
@@ -727,6 +730,11 @@ if FUZZ_OPT.enabled()
 else
     report_conf_data.set('FUZZ_ENABLED', 'disabled')
 endif
+if valgrind.found()
+    report_conf_data.set('VALGRIND', valgrind.full_path())
+else
+    report_conf_data.set('VALGRIND', 'no')
+endif
 if have_afl
     report_conf_data.set('HAVE_AFL', 'yes')
 else