From 26f2f2c28329905e32b5de0d0a1975790a26e1b6 Mon Sep 17 00:00:00 2001 From: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com> Date: Thu, 29 Oct 2020 11:26:27 +0300 Subject: [PATCH] SYNERGY-317 Configure requires dns_sd.h for enteprise (#6819) --- CMakeLists.txt | 14 ++++++++------ ChangeLog | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dbccbce0d..3a1ff16aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,13 +248,15 @@ if (UNIX) list (APPEND libs Xi) endif() - set (DnsSdlib "dns_sd.h") - set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}") - check_include_files ("${DnsSdlib}" HAVE_DNS_SD) - if (NOT HAVE_DNS_SD) + if (NOT SYNERGY_ENTERPRISE) + set (DnsSdlib "dns_sd.h") + set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}") + check_include_files ("${DnsSdlib}" HAVE_DNS_SD) + if (NOT HAVE_DNS_SD) message (FATAL_ERROR "Missing header: " ${DnsSdlib}) - endif() - endif() + endif() + endif() + endif() # For config.h, set some static values; it may be a good idea to make # these values dynamic for non-standard UNIX compilers. diff --git a/ChangeLog b/ChangeLog index d3fb09c27..535ad4917 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ Bug fixes: - #6804 Synergy loses edition when creating a System scope config - #6660 + #6582 Add missing XAtom for utf-8 handling with Xorg - #6814 The system asks to save twice. +- #6817 Configure requires dns_sd.h for enterprise version Enhancements: - #6750 Integrate SonarCloud for static analysis and test coverage