#5921: Use libsystemd instead of libsystemd-daemon (original patches by Sandro Tosi and Mike Gilbert)
In systemd v209, released over two years ago, the various libsystemd-* libraries (libsystemd-journal.so, libsystemd-login.so, libsystem-daemon.so, libsystemd-id128.so) were merged into a single libsystemd.so library to reduce code duplication and avoid cyclic dependencies.
This commit is contained in:
parent
2b917de65b
commit
0862099d0b
|
@ -398,9 +398,9 @@ endif()
|
||||||
if(WITH_SYSTEMD)
|
if(WITH_SYSTEMD)
|
||||||
tr_get_required_flag(WITH_SYSTEMD SYSTEMD_IS_REQUIRED)
|
tr_get_required_flag(WITH_SYSTEMD SYSTEMD_IS_REQUIRED)
|
||||||
|
|
||||||
pkg_check_modules(SYSTEMD_DAEMON ${SYSTEMD_IS_REQUIRED} libsystemd-daemon)
|
pkg_check_modules(SYSTEMD ${SYSTEMD_IS_REQUIRED} libsystemd)
|
||||||
|
|
||||||
tr_fixup_auto_option(WITH_SYSTEMD SYSTEMD_DAEMON_FOUND SYSTEMD_IS_REQUIRED)
|
tr_fixup_auto_option(WITH_SYSTEMD SYSTEMD_FOUND SYSTEMD_IS_REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${CMAKE_BINARY_DIR})
|
include_directories(${CMAKE_BINARY_DIR})
|
||||||
|
|
16
configure.ac
16
configure.ac
|
@ -240,15 +240,15 @@ dnl
|
||||||
dnl file monitoring for the daemon
|
dnl file monitoring for the daemon
|
||||||
|
|
||||||
# Check whether to enable systemd startup notification.
|
# Check whether to enable systemd startup notification.
|
||||||
# This requires libsystemd-daemon.
|
# This requires libsystemd.
|
||||||
AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon],
|
AC_ARG_WITH([systemd], AS_HELP_STRING([--with-systemd],
|
||||||
[Add support for systemd startup notification (default is autodetected)]),
|
[Add support for systemd startup notification (default is autodetected)]),
|
||||||
[USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
|
[USE_SYSTEMD=$withval], [USE_SYSTEMD=auto])
|
||||||
AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
|
AS_IF([test "x$USE_SYSTEMD" != "xno"], [
|
||||||
PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
|
PKG_CHECK_MODULES([SYSTEMD], [libsystemd],
|
||||||
[AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
|
[AC_DEFINE(USE_SYSTEMD,1,[Use systemd startup notification])],
|
||||||
[AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
|
[AS_IF([test "x$USE_SYSTEMD" = "xyes"],
|
||||||
[AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
|
[AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])]
|
||||||
)]
|
)]
|
||||||
)
|
)
|
||||||
])
|
])
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
project(trdaemon)
|
project(trdaemon)
|
||||||
|
|
||||||
if(WITH_SYSTEMD)
|
if(WITH_SYSTEMD)
|
||||||
add_definitions(-DUSE_SYSTEMD_DAEMON)
|
add_definitions(-DUSE_SYSTEMD)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
|
@ -37,14 +37,14 @@ add_executable(${TR_NAME}-daemon
|
||||||
${${PROJECT_NAME}_WIN32_RC_FILE})
|
${${PROJECT_NAME}_WIN32_RC_FILE})
|
||||||
|
|
||||||
set_target_properties(${TR_NAME}-daemon PROPERTIES
|
set_target_properties(${TR_NAME}-daemon PROPERTIES
|
||||||
COMPILE_FLAGS "${SYSTEMD_DAEMON_CFLAGS}"
|
COMPILE_FLAGS "${SYSTEMD_CFLAGS}"
|
||||||
LINK_FLAGS "${SYSTEMD_DAEMON_LDFLAGS}"
|
LINK_FLAGS "${SYSTEMD_LDFLAGS}"
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(${TR_NAME}-daemon
|
target_link_libraries(${TR_NAME}-daemon
|
||||||
${TR_NAME}
|
${TR_NAME}
|
||||||
${EVENT2_LIBRARIES}
|
${EVENT2_LIBRARIES}
|
||||||
${SYSTEMD_DAEMON_LIBRARIES}
|
${SYSTEMD_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
tr_win32_app_info(${PROJECT_NAME}_remote_WIN32_RC_FILE
|
tr_win32_app_info(${PROJECT_NAME}_remote_WIN32_RC_FILE
|
||||||
|
|
|
@ -3,7 +3,7 @@ AM_CPPFLAGS = -I@top_srcdir@ -DEMBEDDED
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
@LIBEVENT_CFLAGS@ \
|
@LIBEVENT_CFLAGS@ \
|
||||||
@LIBCURL_CFLAGS@ \
|
@LIBCURL_CFLAGS@ \
|
||||||
@SYSTEMD_DAEMON_CFLAGS@ \
|
@SYSTEMD_CFLAGS@ \
|
||||||
@ZLIB_CFLAGS@ \
|
@ZLIB_CFLAGS@ \
|
||||||
@PTHREAD_CFLAGS@
|
@PTHREAD_CFLAGS@
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ LDADD = \
|
||||||
@LIBCURL_LIBS@ \
|
@LIBCURL_LIBS@ \
|
||||||
@CRYPTO_LIBS@ \
|
@CRYPTO_LIBS@ \
|
||||||
@INTLLIBS@ \
|
@INTLLIBS@ \
|
||||||
@SYSTEMD_DAEMON_LIBS@ \
|
@SYSTEMD_LIBS@ \
|
||||||
@ZLIB_LIBS@ \
|
@ZLIB_LIBS@ \
|
||||||
@PTHREAD_LIBS@ \
|
@PTHREAD_LIBS@ \
|
||||||
${LIBM}
|
${LIBM}
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#include <libtransmission/version.h>
|
#include <libtransmission/version.h>
|
||||||
#include <libtransmission/watchdir.h>
|
#include <libtransmission/watchdir.h>
|
||||||
|
|
||||||
#ifdef USE_SYSTEMD_DAEMON
|
#ifdef USE_SYSTEMD
|
||||||
#include <systemd/sd-daemon.h>
|
#include <systemd/sd-daemon.h>
|
||||||
#else
|
#else
|
||||||
static void sd_notify (int status UNUSED, const char * str UNUSED) { }
|
static void sd_notify (int status UNUSED, const char * str UNUSED) { }
|
||||||
|
|
Loading…
Reference in New Issue