From 8f20f834b00e007c03c5363683fb32664c86f463 Mon Sep 17 00:00:00 2001
From: Andrei Pavel <andrei@isc.org>
Date: Fri, 20 Jun 2025 00:47:44 +0300
Subject: [PATCH] [#3919] Fix some TODOs related to autotools removal

---
 doc/devel/debug.dox                            | 2 +-
 fuzz/main.cc                                   | 5 -----
 meson.build                                    | 2 --
 src/lib/log/logger_manager_impl.cc             | 4 ++--
 src/lib/testutils/xml_reporting_test_lib.sh.in | 6 ------
 5 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/doc/devel/debug.dox b/doc/devel/debug.dox
index 556ed2ebd9..d06d3e3c6f 100644
--- a/doc/devel/debug.dox
+++ b/doc/devel/debug.dox
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2023-2025 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/fuzz/main.cc b/fuzz/main.cc
index 741d8e7028..82f325dba2 100644
--- a/fuzz/main.cc
+++ b/fuzz/main.cc
@@ -37,11 +37,6 @@ main(int, char* argv[]) {
     // Determine some paths.
     Path const this_binary(argv[0]);
     string ancestor_path(this_binary.parentPath());
-    // TODO: remove kludgy if-condition when autotools are removed.
-    if (Path(ancestor_path).filename() == ".libs") {
-        ancestor_path = Path(ancestor_path).parentPath();
-    }
-    cout << ancestor_path << endl;
     string const filename(this_binary.filename());
     stringstream ss;
     ss << ancestor_path << "/input/" << filename;
diff --git a/meson.build b/meson.build
index 1d836e90d5..426afb8eb9 100644
--- a/meson.build
+++ b/meson.build
@@ -1006,7 +1006,6 @@ CONFIG_REPORT = configure_file(
     command: [TOP_BUILD_DIR / 'config-report.sh'],
 )
 
-# TODO: Change to config.h.in when autotools are removed.
 configure_file(
     input: 'config.h.in',
     output: 'config.h',
@@ -1015,7 +1014,6 @@ configure_file(
     install_dir: INCLUDEDIR / 'kea',
 )
 
-# TODO: Change to kea_version.h.in when autotools are removed.
 configure_file(
     input: 'kea_version.h.in',
     output: 'kea_version.h',
diff --git a/src/lib/log/logger_manager_impl.cc b/src/lib/log/logger_manager_impl.cc
index e8c0e066c8..afb1c15f43 100644
--- a/src/lib/log/logger_manager_impl.cc
+++ b/src/lib/log/logger_manager_impl.cc
@@ -251,8 +251,8 @@ void LoggerManagerImpl::initRootLogger(isc::log::Severity severity,
 {
     log4cplus::Logger::getDefaultHierarchy().resetConfiguration();
 
-    // Disable log4cplus' own logging, unless --enable-debug was
-    // specified to configure. Note that this does not change
+    // Disable log4cplus' own logging, unless "-D tests=enabled" was
+    // pass to "meson setup". Note that this does not change
     // LogLog's levels (that is still just INFO).
 #ifndef ENABLE_DEBUG
     log4cplus::helpers::LogLog::getLogLog()->setQuietMode(true);
diff --git a/src/lib/testutils/xml_reporting_test_lib.sh.in b/src/lib/testutils/xml_reporting_test_lib.sh.in
index b0c1576e57..3ded822ec6 100755
--- a/src/lib/testutils/xml_reporting_test_lib.sh.in
+++ b/src/lib/testutils/xml_reporting_test_lib.sh.in
@@ -14,12 +14,6 @@ set -eu
 
 # Add an entry to the XML test report.
 report_test_result_in_xml() {
-    # TODO: Remove this if-statemenet when autotools are removed.
-    if test ! -d "@TOP_BUILD_DIR@"; then
-        # There is nowhere to report.
-        return
-    fi
-
     # Declarations
     local test_name="${1}"; shift
     local exit_code="${1}"; shift