Use pkg-config first to find libraries

cmake/Modules/FindLibidn.cmake

@@ -15,6 +15,10 @@
 #
 # This file is in the public domain
 
+include(FindPkgConfig)
+pkg_check_modules(LIBIDN libidn)
+
+if(NOT LIBIDN_FOUND)
   find_path(LIBIDN_INCLUDE_DIRS NAMES stringprep.h
     DOC "The libidn include directory")
 
@@ -25,12 +29,13 @@ find_library(LIBIDN_LIBRARIES NAMES idn
   # Use some standard module to handle the QUIETLY and REQUIRED arguments, and
   # set LIBIDN_FOUND to TRUE if these two variables are set.
   include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Libidn REQUIRED_VARS LIBIDN_LIBRARIES LIBIDN_INCLUDE_DIRS)
+  find_package_handle_standard_args(LIBIDN REQUIRED_VARS LIBIDN_LIBRARIES LIBIDN_INCLUDE_DIRS)
 
   # Compatibility for all the ways of writing these variables
   if(LIBIDN_FOUND)
     set(LIBIDN_INCLUDE_DIR ${LIBIDN_INCLUDE_DIRS})
     set(LIBIDN_LIBRARY ${LIBIDN_LIBRARIES})
   endif()
+endif()
 
 mark_as_advanced(LIBIDN_INCLUDE_DIRS LIBIDN_LIBRARIES)

cmake/Modules/FindSystemdDaemon.cmake

@@ -15,20 +15,25 @@
 #
 # This file is in the public domain
 
+include(FindPkgConfig)
+pkg_check_modules(SYSTEMDDAEMON libsystemd-daemon)
+
+if(NOT SYSTEMDDAEMON_FOUND)
   find_path(SYSTEMDDAEMON_INCLUDE_DIRS NAMES systemd/sd-daemon.h
     DOC "The Systemd Daemon include directory")
 
-find_library(SYSTEMDDAEMON_LIBRARIES NAMES systemd
+  find_library(SYSTEMDDAEMON_LIBRARIES NAMES systemd-daemon systemd
     DOC "The Systemd Daemon library")
 
   # Use some standard module to handle the QUIETLY and REQUIRED arguments, and
   # set SYSTEMDDAEMON_FOUND to TRUE if these two variables are set.
   include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SystemdDaemon REQUIRED_VARS SYSTEMDDAEMON_LIBRARIES SYSTEMDDAEMON_INCLUDE_DIRS)
+  find_package_handle_standard_args(SYSTEMDDAEMON REQUIRED_VARS SYSTEMDDAEMON_LIBRARIES SYSTEMDDAEMON_INCLUDE_DIRS)
 
   if(SYSTEMDDAEMON_FOUND)
     set(SYSTEMDDAEMON_LIBRARY ${SYSTEMDDAEMON_LIBRARIES})
     set(SYSTEMDDAEMON_INCLUDE_DIR ${SYSTEMDDAEMON_INCLUDE_DIRS})
   endif()
+endif()
 
 mark_as_advanced(SYSTEMDDAEMON_INCLUDE_DIRS SYSTEMDDAEMON_LIBRARIES)