From de1cf75eecf2bdc4f02737a5b59b791baf55213a Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Sun, 16 Oct 2022 15:25:04 +0100
Subject: [PATCH] [Minor] Move hyperscan tools to the libserver domain

---
 src/libserver/CMakeLists.txt                       | 1 +
 src/{libutil/cxx => libserver}/hyperscan_tools.cxx | 3 +--
 src/libutil/CMakeLists.txt                         | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename src/{libutil/cxx => libserver}/hyperscan_tools.cxx (99%)

diff --git a/src/libserver/CMakeLists.txt b/src/libserver/CMakeLists.txt
index d287f44c1..c4940f917 100644
--- a/src/libserver/CMakeLists.txt
+++ b/src/libserver/CMakeLists.txt
@@ -42,6 +42,7 @@ SET(LIBRSPAMDSERVERSRC
 				${CMAKE_CURRENT_SOURCE_DIR}/html/html_url.cxx
 				${CMAKE_CURRENT_SOURCE_DIR}/html/html.cxx
 				${CMAKE_CURRENT_SOURCE_DIR}/html/html_tests.cxx
+				${CMAKE_CURRENT_SOURCE_DIR}/hyperscan_tools.cxx
 				${LIBCSSSRC})
 
 # Librspamd-server
diff --git a/src/libutil/cxx/hyperscan_tools.cxx b/src/libserver/hyperscan_tools.cxx
similarity index 99%
rename from src/libutil/cxx/hyperscan_tools.cxx
rename to src/libserver/hyperscan_tools.cxx
index f5086d1e4..3dedad52d 100644
--- a/src/libutil/cxx/hyperscan_tools.cxx
+++ b/src/libserver/hyperscan_tools.cxx
@@ -20,10 +20,9 @@
 #include "contrib/ankerl/unordered_dense.h"
 #include "contrib/ankerl/svector.h"
 #include "fmt/core.h"
-#include "locked_file.hxx"
+#include "libutil/cxx/locked_file.hxx"
 #include "hs.h"
 #include "logger.h"
-#include "locked_file.hxx"
 
 #include <glob.h> /* for glob */
 #include <unistd.h> /* for unlink */
diff --git a/src/libutil/CMakeLists.txt b/src/libutil/CMakeLists.txt
index 8602baf6e..7b3103720 100644
--- a/src/libutil/CMakeLists.txt
+++ b/src/libutil/CMakeLists.txt
@@ -18,7 +18,6 @@ SET(LIBRSPAMDUTILSRC
 				${CMAKE_CURRENT_SOURCE_DIR}/heap.c
 				${CMAKE_CURRENT_SOURCE_DIR}/multipattern.c
 				${CMAKE_CURRENT_SOURCE_DIR}/cxx/utf8_util.cxx
-				${CMAKE_CURRENT_SOURCE_DIR}/cxx/locked_file.cxx
-				${CMAKE_CURRENT_SOURCE_DIR}/cxx/hyperscan_tools.cxx)
+				${CMAKE_CURRENT_SOURCE_DIR}/cxx/locked_file.cxx)
 # Rspamdutil
 SET(RSPAMD_UTIL ${LIBRSPAMDUTILSRC} PARENT_SCOPE)
\ No newline at end of file
-- 
2.39.5