[#3731] Checkpoint before rebase

diff --git a/config-report.sh.in b/config-report.sh.in
index 28683f35360aa19634e4ed3d3b1f93bbb402f98d..798c86c9bf03232f77137d53cf0ae067b8a5fc8b 100755 (executable)
--- a/config-report.sh.in
+++ b/config-report.sh.in
@@ -25,6 +25,8 @@ Build Options:  @BUILD_OPTIONS@
 
 Meson Version:  @MESON_VERSION@
 
+Meson info:     @MESON_INFO@
+
 C++ Compiler:
   CXX:             @CXX@
   CXX_ID:          @CXX_ID@
@@ -40,49 +42,33 @@ Python:
   PYTHON_VERSION:  @PYTHON_VERSION@
   PKGPYTHONDIR:    @PKGPYTHONDIR@
 
-Boost:
-  BOOST_VERSION:   @BOOST_VERSION@
+Boost:             @BOOST_VERSION@
 
-@CRYPTO_NAME@:
-  CRYPTO_VERSION:  @CRYPTO_VERSION@
-  CRYPTO_INCLUDE:  @CRYPTO_INCLUDE@
-  CRYPTO_LIBDIR:   @CRYPTO_LIBDIR@
+@CRYPTO_NAME@:     @CRYPTO_VERSION@
 
-Log4cplus:
-  LOG4CPLUS_VERSION:  @LOG4CPLUS_VERSION@
-  LOG4CPLUS_INCLUDE:  @LOG4CPLUS_INCLUDE@
-  LOG4CPLUS_LIBDIR:   @LOG4CPLUS_LIBDIR@
+Log4cplus:         @LOG4CPLUS_VERSION@
 
-Flex/bison:
-  FLEX:  @FLEX@
-  BISON: @BISON@
+flex:              @FLEX@
+Bison:             @BISON@
 '
 
 if test '@HAVE_MYSQL@' != 'no'; then
 add_to_report '
-MySQL:
-  MYSQL_VERSION:   @MYSQL_VERSION@
-  MYSQL_INCLUDE:   @MYSQL_INCLUDE@
-  MYSQL_LIBDIR:    @MYSQL_LIBDIR@
+MySQL:             @MYSQL_VERSION@
 '
 else
 add_to_report '
-MySQL:
-  no
+MySQL:             no
 '
 fi
 
 if test '@HAVE_PGSQL@' != 'no'; then
 add_to_report '
-PostgreSQL:
-  PGSQL_VERSION:   @PGSQL_VERSION@
-  PGSQL_INCLUDE:   @PGSQL_INCLUDE@
-  PGSQL_LIBDIR:    @PGSQL_LIBDIR@
+PostgreSQL:        @PGSQL_VERSION@
 '
 else
 add_to_report '
-PostgreSQL:
-  no
+PostgreSQL:        no
 '
 fi
 
@@ -94,22 +80,17 @@ Netconf:
 '
 else
 add_to_report '
-Netconf:
-  no
+Netconf:           no
 '
 fi
 
 if test '@HAVE_GTEST@' != 'no'; then
 add_to_report '
-Google Test:
-  GTEST_VERSION:   @GTEST_VERSION@
-  GTEST_INCLUDE:   @GTEST_INCLUDE@
-  GTEST_LIBDIR:    @GTEST_LIBDIR@
+Google Test:       @GTEST_VERSION@
 '
 else
 add_to_report '
-Google Test:
-  no
+Google Test:       no
 '
 fi
 
@@ -117,8 +98,6 @@ if test '@HAVE_KRB5@' != 'no'; then
 add_to_report '
 Kerberos5 GSS-API support:
   KRB5_GSSAPI_VERSION:  @KRB5_GSSAPI_VERSION@
-  KRB5_GSSAPI_CFLAGS:   @KRB5_GSSAPI_CFLAGS@
-  KRB5_GSSAPI_LIBS:     @KRB5_GSSAPI_LIBS@
   KRB5_GSSAPI_VENDOR:   @KRB5_GSSAPI_VENDOR@
 '
 else
@@ -131,7 +110,6 @@ fi
 add_to_report '
 Developer:
   Tests:            @TESTS_ENABLED@
-  Valgrind:         @VALGRIND@
   Fuzzing:          @FUZZ_ENABLED@
   AFL:              @HAVE_AFL@
 '

diff --git a/meson.build b/meson.build
index 006d239fc2a71b6358c66e0b45f6f55f9dfd4c2a..3f6ab748b80dae87ee632143dfdf6834cd1aa0b9 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -524,6 +524,12 @@ report_conf_data.set('HOOKS_DIR', DEFAULT_HOOKS_PATH)
 report_conf_data.set('PREMIUM', premium ? 'yes' : 'no')
 report_conf_data.set('BUILD_OPTIONS', meson.build_options())
 report_conf_data.set('MESON_VERSION', meson.version())
+if fs.is_dir(TOP_BUILD_DIR / 'meson-info')
+    MESON_INFO = PREFIX / DATADIR / 'kea/meson-info'
+else
+    MESON_INFO = 'not installed'
+endif
+report_conf_data.set('MESON_INFO', MESON_INFO)
 report_conf_data.set('CXX', ' '.join(cpp.cmd_array()))
 report_conf_data.set('CXX_ID', cpp.get_id())
 result = run_command(cpp, '--version', check: false)
@@ -536,11 +542,10 @@ endif
 result = cpp.run(
     fs.read('compiler-checks/get-cpp-standard.cc'),
     name: 'Get cpp standard',
+    required: true,
 )
 if result.returncode() == 0
     report_conf_data.set('CXX_STANDARD', result.stdout().strip())
-else
-    report_conf_data.set('CXX_STANDARD', 'unknown')
 endif
 report_conf_data.set('CXX_ARGS', ' '.join(compile_args))
 report_conf_data.set('LD_ID', cpp.get_linker_id())
@@ -556,16 +561,8 @@ result = cpp.run(
 if result.returncode() == 0
     report_conf_data.set('BOOST_VERSION', result.stdout().strip())
 else
-    report_conf_data.set('BOOST_VERSION', 'unknown')
+    report_conf_data.set('BOOST_VERSION', 'unknown version')
 endif
-report_conf_data.set(
-    'CRYPTO_INCLUDE',
-    CRYPTO_DEP.get_variable('includedir', default_value: 'unknown'),
-)
-report_conf_data.set(
-    'CRYPTO_LIBDIR',
-    CRYPTO_DEP.get_variable('libdir', default_value: 'unknown'),
-)
 if CRYPTO_DEP.name() == botan.name()
     report_conf_data.set('CRYPTO_NAME', 'Botan')
     result = cpp.run(
@@ -574,10 +571,14 @@ if CRYPTO_DEP.name() == botan.name()
         dependencies: [CRYPTO_DEP],
     )
     if result.returncode() == 0
-        report_conf_data.set('CRYPTO_VERSION', result.stdout().strip())
+        version = result.stdout().strip()
     else
-        report_conf_data.set('CRYPTO_VERSION', botan.version())
+        version = botan.version()
+    endif
+    if version == 'unknown'
+        version = 'unknown version'
     endif
+    report_conf_data.set('CRYPTO_VERSION', version)
 elif CRYPTO_DEP.name() == openssl.name()
     report_conf_data.set('CRYPTO_NAME', 'OpenSSL')
     result = cpp.run(
@@ -586,24 +587,14 @@ elif CRYPTO_DEP.name() == openssl.name()
         dependencies: [CRYPTO_DEP],
     )
     if result.returncode() == 0
-        report_conf_data.set('CRYPTO_VERSION', result.stdout().strip())
+        version = result.stdout().strip()
     else
-        report_conf_data.set('CRYPTO_VERSION', openssl.version())
+        version = openssl.version()
     endif
-endif
-# TODO: remove if-condition when support for Ubuntu 20.04 gets removed.
-if LOG4CPLUS_DEP.type_name() == 'pkgconfig'
-    report_conf_data.set(
-        'LOG4CPLUS_INCLUDE',
-        LOG4CPLUS_DEP.get_variable('includedir', default_value: 'unknown'),
-    )
-    report_conf_data.set(
-        'LOG4CPLUS_LIBDIR',
-        LOG4CPLUS_DEP.get_variable('libdir', default_value: 'unknown'),
-    )
-else
-    report_conf_data.set('LOG4CPLUS_INCLUDE', 'unknown')
-    report_conf_data.set('LOG4CPLUS_LIBDIR', 'unknown')
+    if version == 'unknown'
+        version = 'unknown version'
+    endif
+    report_conf_data.set('CRYPTO_VERSION', version)
 endif
 result = cpp.run(
     fs.read('compiler-checks/get-log4cplus-version.cc'),
@@ -611,52 +602,45 @@ result = cpp.run(
     dependencies: [LOG4CPLUS_DEP],
 )
 if result.returncode() == 0
-    report_conf_data.set('LOG4CPLUS_VERSION', result.stdout().strip())
+    version = result.stdout().strip()
 else
-    report_conf_data.set('LOG4CPLUS_VERSION', log4cplus.version())
+    version = log4cplus.version()
+endif
+if version == 'unknown'
+    version = 'unknown version'
 endif
+report_conf_data.set('LOG4CPLUS_VERSION', version)
 if FLEX.found()
     report_conf_data.set('FLEX', FLEX.full_path())
 else
-    report_conf_data.set('FLEX', 'unknown')
+    report_conf_data.set('FLEX', 'no')
 endif
 if BISON.found()
     report_conf_data.set('BISON', BISON.full_path())
 else
-    report_conf_data.set('BISON', 'unknown')
+    report_conf_data.set('BISON', 'no')
 endif
 if MYSQL_DEP.found()
-    report_conf_data.set('MYSQL_VERSION', MYSQL_DEP.version())
-    report_conf_data.set(
-        'MYSQL_INCLUDE',
-        MYSQL_DEP.get_variable('includedir', default_value: 'unknown'),
-    )
-    report_conf_data.set(
-        'MYSQL_LIBDIR',
-        MYSQL_DEP.get_variable('libdir', default_value: 'unknown'),
-    )
+    report_conf_data.set('HAVE_MYSQL', 'yes')
+    version = MYSQL_DEP.version()
+    if version == 'unknown'
+        version = 'unknown version'
+    endif
+    report_conf_data.set('MYSQL_VERSION', version)
 else
     report_conf_data.set('HAVE_MYSQL', 'no')
-    report_conf_data.set('MYSQL_VERSION', 'unknown')
-    report_conf_data.set('MYSQL_INCLUDE', 'unknown')
-    report_conf_data.set('MYSQL_LIBDIR', 'unknown')
+    report_conf_data.set('MYSQL_VERSION', 'no')
 endif
 if POSTGRESQL_DEP.found()
     report_conf_data.set('HAVE_PGSQL', 'yes')
-    report_conf_data.set('PGSQL_VERSION', POSTGRESQL_DEP.version())
-    report_conf_data.set(
-        'PGSQL_INCLUDE',
-        POSTGRESQL_DEP.get_variable('includedir', default_value: 'unknown'),
-    )
-    report_conf_data.set(
-        'PGSQL_LIBDIR',
-        POSTGRESQL_DEP.get_variable('libdir', default_value: 'unknown'),
-    )
+    version = POSTGRESQL_DEP.version()
+    if version == 'unknown'
+        version = 'unknown version'
+    endif
+    report_conf_data.set('PGSQL_VERSION', version)
 else
     report_conf_data.set('HAVE_PGSQL', 'no')
-    report_conf_data.set('PGSQL_VERSION', 'unknown')
-    report_conf_data.set('PGSQL_INCLUDE', 'unknown')
-    report_conf_data.set('PGSQL_LIBDIR', 'unknown')
+    report_conf_data.set('PGSQL_VERSION', 'no')
 endif
 if NETCONF_DEP.found()
     report_conf_data.set('HAVE_NETCONF', 'yes')
@@ -670,37 +654,27 @@ if NETCONF_DEP.found()
     )
 else
     report_conf_data.set('HAVE_NETCONF', 'no')
-    report_conf_data.set('LIBYANG_PREFIX', 'unknown')
-    report_conf_data.set('SYSREPO_PREFIX', 'unknown')
+    report_conf_data.set('LIBYANG_PREFIX', 'no')
+    report_conf_data.set('SYSREPO_PREFIX', 'no')
 endif
 if FUZZ_OPT.enabled() or TESTS_OPT.enabled()
     report_conf_data.set('HAVE_GTEST', 'yes')
-    report_conf_data.set(
-        'GTEST_INCLUDE',
-        GTEST_DEP.get_variable('includedir', default_value: 'unknown'),
-    )
-    report_conf_data.set(
-        'GTEST_LIBDIR',
-        GTEST_DEP.get_variable('libdir', default_value: 'unknown'),
-    )
-    report_conf_data.set('GTEST_VERSION', GTEST_DEP.version())
+    version = GTEST_DEP.version()
+    if version == 'unknown'
+        version = 'unknown version'
+    endif
+    report_conf_data.set('GTEST_VERSION', version)
 else
     report_conf_data.set('HAVE_GTEST', 'no')
-    report_conf_data.set('GTEST_VERSION', 'unknown')
-    report_conf_data.set('GTEST_INCLUDE', 'unknown')
-    report_conf_data.set('GTEST_LIBDIR', 'unknown')
+    report_conf_data.set('GTEST_VERSION', 'no')
 endif
 if KRB5_DEP.found()
     report_conf_data.set('HAVE_KRB5', 'yes')
-    report_conf_data.set('KRB5_GSSAPI_VERSION', KRB5_DEP.version())
-    report_conf_data.set(
-        'KRB5_GSSAPI_CFLAGS',
-        KRB5_DEP.get_variable('cflags', default_value: 'unknown'),
-    )
-    report_conf_data.set(
-        'KRB5_GSSAPI_LIBS',
-        KRB5_DEP.get_variable('libs', default_value: 'unknown'),
-    )
+    version = KRB5_DEP.version()
+    if version == 'unknown'
+        version = 'unknown version'
+    endif
+    report_conf_data.set('KRB5_GSSAPI_VERSION', version)
     report_conf_data.set(
         'KRB5_GSSAPI_VENDOR',
         KRB5_DEP.get_variable('vendor', default_value: 'unknown'),
@@ -708,8 +682,6 @@ if KRB5_DEP.found()
 else
     report_conf_data.set('HAVE_KRB5', 'no')
     report_conf_data.set('KRB5_GSSAPI_VERSION', 'unknown')
-    report_conf_data.set('KRB5_GSSAPI_CFLAGS', 'unknown')
-    report_conf_data.set('KRB5_GSSAPI_LIBS', 'unknown')
     report_conf_data.set('KRB5_GSSAPI_VENDOR', 'unknown')
 endif
 if TESTS_OPT.enabled()
@@ -717,11 +689,6 @@ if TESTS_OPT.enabled()
 else
     report_conf_data.set('TESTS_ENABLED', 'disabled')
 endif
-if valgrind.found()
-    report_conf_data.set('VALGRIND', valgrind.full_path())
-else
-    report_conf_data.set('VALGRIND', 'no')
-endif
 if FUZZ_OPT.enabled()
     report_conf_data.set('FUZZ_ENABLED', 'enabled')
 else
@@ -893,3 +860,12 @@ install_emptydir('var/run/kea')
 
 # Print the setup report.
 message(run_command(['cat', CONFIG_REPORT], check: true).stdout())
+
+# Install meson-info
+if fs.is_dir(TOP_BUILD_DIR / 'meson-info')
+    install_subdir(
+        TOP_BUILD_DIR / 'meson-info',
+        install_dir: DATADIR / 'kea',
+        strip_directory: false,
+    )
+endif