Changeset 14733

Timestamp:

Apr 23, 2016, 4:13:25 PM (6 years ago)

Author:

mikedld

Message:

#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.

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• configure.ac (modified) (1 diff)
• daemon/CMakeLists.txt (modified) (3 diffs)
• daemon/Makefile.am (modified) (2 diffs)
• daemon/daemon.c (modified) (1 diff)

trunk/CMakeLists.txt

@@ -399 +399 @@
     tr_get_required_flag(WITH_SYSTEMD SYSTEMD_IS_REQUIRED)
 
-    pkg_check_modules(SYSTEMD_DAEMON ${SYSTEMD_IS_REQUIRED} libsystemd-daemon)
-
-    tr_fixup_auto_option(WITH_SYSTEMD SYSTEMD_DAEMON_FOUND SYSTEMD_IS_REQUIRED)
+    pkg_check_modules(SYSTEMD ${SYSTEMD_IS_REQUIRED} libsystemd)
+
+    tr_fixup_auto_option(WITH_SYSTEMD SYSTEMD_FOUND SYSTEMD_IS_REQUIRED)
 endif()
 

trunk/configure.ac

@@ -241 +241 @@
 
 # Check whether to enable systemd startup notification.
-# This requires libsystemd-daemon.
-AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon],
+# This requires libsystemd.
+AC_ARG_WITH([systemd], AS_HELP_STRING([--with-systemd],
             [Add support for systemd startup notification (default is autodetected)]),
-            [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
-AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
-    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
-        [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
-        [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
-            [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
+            [USE_SYSTEMD=$withval], [USE_SYSTEMD=auto])
+AS_IF([test "x$USE_SYSTEMD" != "xno"], [
+    PKG_CHECK_MODULES([SYSTEMD], [libsystemd],
+        [AC_DEFINE(USE_SYSTEMD,1,[Use systemd startup notification])],
+        [AS_IF([test "x$USE_SYSTEMD" = "xyes"],
+            [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])]
         )]
     )

trunk/daemon/CMakeLists.txt

@@ -2 +2 @@
 
 if(WITH_SYSTEMD)
-    add_definitions(-DUSE_SYSTEMD_DAEMON)
+    add_definitions(-DUSE_SYSTEMD)
 endif()
 
@@ -38 +38 @@
 
 set_target_properties(${TR_NAME}-daemon PROPERTIES
-    COMPILE_FLAGS "${SYSTEMD_DAEMON_CFLAGS}"
-    LINK_FLAGS "${SYSTEMD_DAEMON_LDFLAGS}"
+    COMPILE_FLAGS "${SYSTEMD_CFLAGS}"
+    LINK_FLAGS "${SYSTEMD_LDFLAGS}"
 )
 
@@ -45 +45 @@
     ${TR_NAME}
     ${EVENT2_LIBRARIES}
-    ${SYSTEMD_DAEMON_LIBRARIES}
+    ${SYSTEMD_LIBRARIES}
 )
 

trunk/daemon/Makefile.am

@@ -4 +4 @@
     @LIBEVENT_CFLAGS@ \
     @LIBCURL_CFLAGS@ \
-    @SYSTEMD_DAEMON_CFLAGS@ \
+    @SYSTEMD_CFLAGS@ \
     @ZLIB_CFLAGS@ \
     @PTHREAD_CFLAGS@
@@ -30 +30 @@
     @CRYPTO_LIBS@ \
     @INTLLIBS@ \
-    @SYSTEMD_DAEMON_LIBS@ \
+    @SYSTEMD_LIBS@ \
     @ZLIB_LIBS@ \
     @PTHREAD_LIBS@ \

trunk/daemon/daemon.c

@@ -34 +34 @@
 #include <libtransmission/watchdir.h>
 
-#ifdef USE_SYSTEMD_DAEMON
+#ifdef USE_SYSTEMD
  #include <systemd/sd-daemon.h>
 #else