diff options
| author | Sergei Krivonos <sergei.krivonos@mariadb.com> | 2021-12-19 23:26:26 +0200 |
|---|---|---|
| committer | Sergei Krivonos <sergei.krivonos@mariadb.com> | 2021-12-19 23:26:26 +0200 |
| commit | f4293b3d3ebd74f18bbf169ebdbb30d2b1d99dad (patch) | |
| tree | 73ddd2fe87175afdaf26461156eb2c1cc7f5e5d6 | |
| parent | d1afa8ed4fb89b57de3e13ed758730c8151c082d (diff) | |
| download | mariadb-git-bb-10.8-MCOL-4944.tar.gz | |
MCOL-4944: fixed systemd/sd-daemon.h detection: may not use HAVE_SYSTEMD_SD_DAEMON_H namebb-10.8-MCOL-4944
| -rw-r--r-- | cmake/systemd.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/systemd.cmake b/cmake/systemd.cmake index 303b3a25aa9..d672718c42d 100644 --- a/cmake/systemd.cmake +++ b/cmake/systemd.cmake @@ -20,7 +20,7 @@ MACRO(CHECK_SYSTEMD) SET(WITH_SYSTEMD "auto" CACHE STRING "Enable systemd scripts and notification support") IF(WITH_SYSTEMD STREQUAL "yes" OR WITH_SYSTEMD STREQUAL "auto") IF(PKG_CONFIG_FOUND) - IF (NOT DEFINED LIBSYSTEMD_FOUND) + IF (NOT LIBSYSTEMD_FOUND) IF(WITH_SYSTEMD STREQUAL "yes") pkg_search_module(LIBSYSTEMD REQUIRED libsystemd libsystemd-daemon) ELSE() @@ -38,11 +38,11 @@ MACRO(CHECK_SYSTEMD) SET(CMAKE_REQUIRED_LIBRARIES ${LIBSYSTEMD}) CHECK_LIBRARY_EXISTS(systemd sd_listen_fds "" HAVE_SYSTEMD_SD_LISTEN_FDS) CHECK_LIBRARY_EXISTS(systemd sd_listen_fds_with_names "" HAVE_SYSTEMD_SD_LISTEN_FDS_WITH_NAMES) - CHECK_INCLUDE_FILES(systemd/sd-daemon.h HAVE_SYSTEMD_SD_DAEMON_H) + CHECK_INCLUDE_FILES(systemd/sd-daemon.h HAVE_SYSTEMD_SD_DAEMON_HEADER) CHECK_FUNCTION_EXISTS(sd_notify HAVE_SYSTEMD_SD_NOTIFY) CHECK_FUNCTION_EXISTS(sd_notifyf HAVE_SYSTEMD_SD_NOTIFYF) SET(CMAKE_REQUIRED_LIBRARIES) - IF(HAVE_SYSTEMD_SD_DAEMON_H AND HAVE_SYSTEMD_SD_LISTEN_FDS + IF(HAVE_SYSTEMD_SD_DAEMON_HEADER AND HAVE_SYSTEMD_SD_LISTEN_FDS AND HAVE_SYSTEMD_SD_NOTIFY AND HAVE_SYSTEMD_SD_NOTIFYF) SET(HAVE_SYSTEMD TRUE) SET(SYSTEMD_SCRIPTS mariadb-service-convert galera_new_cluster galera_recovery) @@ -58,7 +58,7 @@ LimitMEMLOCK=524288") ELSE() UNSET(LIBSYSTEMD) UNSET(HAVE_SYSTEMD) - UNSET(HAVE_SYSTEMD_SD_DAEMON_H) + UNSET(HAVE_SYSTEMD_SD_DAEMON_HEADER) UNSET(HAVE_SYSTEMD_SD_LISTEN_FDS) UNSET(HAVE_SYSTEMD_SD_NOTIFY) UNSET(HAVE_SYSTEMD_SD_NOTIFYF) |