Skip to content

add optional dnsmasq features to cmake #2874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
darkexplosiveqwx wants to merge 1 commit into
base: development
Choose a base branch
from
+36 −6
Open

add optional dnsmasq features to cmake #2874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,42 @@ endif()
# (e.g. "src/args.c" instead of "/home/user/FTL/src/args.c").
target_compile_definitions(core PRIVATE SOURCE_ROOT="${CMAKE_SOURCE_DIR}/")

option(USE_CONNTRACK "Build FTL with dnsmasq conntrack support, if available" ON)

check_include_file("libnetfilter_conntrack/libnetfilter_conntrack.h" HAVE_LIBNETFILTER_CONNTRACK_H)
find_library(LIBNETFILTER_CONNTRACK NAMES libnetfilter_conntrack${LIBRARY_SUFFIX} netfilter_conntrack)
if(HAVE_LIBNETFILTER_CONNTRACK_H AND LIBNETFILTER_CONNTRACK AND USE_CONNTRACK)
message(STATUS "Building FTL with dnsmasq conntrack support: YES")
target_compile_definitions(dnsmasq PRIVATE HAVE_CONNTRACK)
target_link_libraries(pihole-FTL ${LIBNETFILTER_CONNTRACK})
else()
message(STATUS "Building FTL with dnsmasq conntrack support: NO")
endif()

option(USE_NFTSET "Build FTL with dnsmasq nftset support, if available" ON)

check_include_file("nftables/libnftables.h" HAVE_LIBNFTABLES_H)
find_library(LIBNFTABLES NAMES libnftables${LIBRARY_SUFFIX} nftables)
if(HAVE_LIBNFTABLES_H AND LIBNFTABLES AND USE_NFTSET)
message(STATUS "Building FTL with dnsmasq nftset support: YES")
target_compile_definitions(dnsmasq PRIVATE HAVE_NFTSET)
target_link_libraries(pihole-FTL ${LIBNFTABLES})
else()
message(STATUS "Building FTL with dnsmasq nftset support: NO")
endif()

option(USE_DBUS "Build FTL with dnsmasq DBus support, if available" ON)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
find_package(DBus)
if(DBUS_FOUND AND USE_DBUS)
message(STATUS "Building FTL with dnsmasq DBus support: YES")
target_compile_definitions(dnsmasq PRIVATE HAVE_DBUS)
target_include_directories(dnsmasq PRIVATE ${DBUS_INCLUDE_DIRS})
target_link_libraries(pihole-FTL ${DBUS_LIBRARIES})
else()
message(STATUS "Building FTL with dnsmasq DBus support: NO")
endif()

option(USE_READLINE "Build FTL with readline support, if available" ON)

Expand Down
2 changes: 1 addition & 1 deletion src/FindDBus.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ FIND_PATH(DBUS_ARCH_INCLUDE_DIR
SET(DBUS_INCLUDE_DIRS ${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR})

INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(DBUS REQUIRED_VARS DBUS_INCLUDE_DIRS DBUS_LIBRARIES)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(DBus REQUIRED_VARS DBUS_INCLUDE_DIRS DBUS_LIBRARIES)
5 changes: 0 additions & 5 deletions src/dnsmasq/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,6 @@ RESOLVFILE
#define HAVE_LUASCRIPT
#define HAVE_LIBIDN2
#define HAVE_DNSSEC
#ifdef DNSMASQ_ALL_OPTS
#define HAVE_DBUS
#define HAVE_CONNTRACK
#define HAVE_NFTSET
#endif
/***********************/

/* Default locations for important system files. */
Expand Down