From f5934507c3ba28e0ed4bb86fad230eda86cf167c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Mon, 14 Dec 2020 19:42:12 +0100
Subject: [PATCH] Check for dns_sd.h only when building GUI (#6872)

* Check for dns_sd.h only when building GUI

The <dns_sd.h> header is only used in the synergy GUI component.  Update
the CMake check to be done only if SYNERGY_BUILD_LEGACY_GUI is enabled.
This fixes build failures when GUI is not being built and <dns_sd.h>
is not installed.

While at it, fix indentation around the added check to match the rest
of the file and avoid being misleading.

* Update ChangeLog

Co-authored-by: Serhii Hadzhilov <serhii-external@symless.com>
Co-authored-by: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com>
---
 CMakeLists.txt | 18 +++++++++---------
 ChangeLog      | 19 ++++++++++++++-----
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5647f26c..7d01f24c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -248,15 +248,15 @@ if (UNIX)
             list (APPEND libs Xi)
         endif()
 
-       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()
+        if (NOT SYNERGY_ENTERPRISE AND SYNERGY_BUILD_LEGACY_GUI)
+            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()
 
     # 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 e314c3214..8b49e9614 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
-v1.13.x-??
+v1.13.x
+===========
+Bug fixes:
+- #6858 Application is blurry and unfocused on macOS
+- #6872 Check for dns_sd.h only when building GUI
+
+Enhancements:
+- #6867 Create only 1 artefact for macOS
+
+v1.13.0-rc2
 ===========
 Bug fixes:
 - #6831 Incorporating Sonar's major
@@ -6,15 +15,15 @@ Bug fixes:
 - #6838 Enterprise asks for serial key on Linux system
 - #6849 Auto-hide resets itself
 - #6846 TLS certificate is not created by default for Synergy Enterprise.
-- #6??? Systray Icon on Ubuntu Auto Start
-- #6858 Application is blurry and unfocused on macOS
+- #6859 Systray Icon on Ubuntu Auto Start
+- #6863 Adding MacOS CI Build Steps for Homebrew Cleanup
 
 Enhancements:
 - #6836 Enabling Github Code Scanning
 - #6841 Windows installer has been updated.
 - #6844 macOS installer has been updated.
-- #6??? About Synergy logo refreshed
-- #6867 Create only 1 artefact for macOS
+- #6860 About Synergy logo refreshed
+- #6865 Updated visual assets
 
 v1.12.x-snapshot
 ===========