Changeset 14733
- Timestamp:
- Apr 23, 2016, 4:13:25 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r14730 r14733 399 399 tr_get_required_flag(WITH_SYSTEMD SYSTEMD_IS_REQUIRED) 400 400 401 pkg_check_modules(SYSTEMD _DAEMON ${SYSTEMD_IS_REQUIRED} libsystemd-daemon)402 403 tr_fixup_auto_option(WITH_SYSTEMD SYSTEMD_ DAEMON_FOUND SYSTEMD_IS_REQUIRED)401 pkg_check_modules(SYSTEMD ${SYSTEMD_IS_REQUIRED} libsystemd) 402 403 tr_fixup_auto_option(WITH_SYSTEMD SYSTEMD_FOUND SYSTEMD_IS_REQUIRED) 404 404 endif() 405 405 -
trunk/configure.ac
r14715 r14733 241 241 242 242 # Check whether to enable systemd startup notification. 243 # This requires libsystemd -daemon.244 AC_ARG_WITH([systemd -daemon], AS_HELP_STRING([--with-systemd-daemon],243 # This requires libsystemd. 244 AC_ARG_WITH([systemd], AS_HELP_STRING([--with-systemd], 245 245 [Add support for systemd startup notification (default is autodetected)]), 246 [USE_SYSTEMD _DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])247 AS_IF([test "x$USE_SYSTEMD _DAEMON" != "xno"], [248 PKG_CHECK_MODULES([SYSTEMD _DAEMON], [libsystemd-daemon],249 [AC_DEFINE(USE_SYSTEMD _DAEMON,1,[Use systemd startup notification])],250 [AS_IF([test "x$USE_SYSTEMD _DAEMON" = "xyes"],251 [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd -daemonnot found.])]246 [USE_SYSTEMD=$withval], [USE_SYSTEMD=auto]) 247 AS_IF([test "x$USE_SYSTEMD" != "xno"], [ 248 PKG_CHECK_MODULES([SYSTEMD], [libsystemd], 249 [AC_DEFINE(USE_SYSTEMD,1,[Use systemd startup notification])], 250 [AS_IF([test "x$USE_SYSTEMD" = "xyes"], 251 [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])] 252 252 )] 253 253 ) -
trunk/daemon/CMakeLists.txt
r14651 r14733 2 2 3 3 if(WITH_SYSTEMD) 4 add_definitions(-DUSE_SYSTEMD _DAEMON)4 add_definitions(-DUSE_SYSTEMD) 5 5 endif() 6 6 … … 38 38 39 39 set_target_properties(${TR_NAME}-daemon PROPERTIES 40 COMPILE_FLAGS "${SYSTEMD_ DAEMON_CFLAGS}"41 LINK_FLAGS "${SYSTEMD_ DAEMON_LDFLAGS}"40 COMPILE_FLAGS "${SYSTEMD_CFLAGS}" 41 LINK_FLAGS "${SYSTEMD_LDFLAGS}" 42 42 ) 43 43 … … 45 45 ${TR_NAME} 46 46 ${EVENT2_LIBRARIES} 47 ${SYSTEMD_ DAEMON_LIBRARIES}47 ${SYSTEMD_LIBRARIES} 48 48 ) 49 49 -
trunk/daemon/Makefile.am
r14651 r14733 4 4 @LIBEVENT_CFLAGS@ \ 5 5 @LIBCURL_CFLAGS@ \ 6 @SYSTEMD_ DAEMON_CFLAGS@ \6 @SYSTEMD_CFLAGS@ \ 7 7 @ZLIB_CFLAGS@ \ 8 8 @PTHREAD_CFLAGS@ … … 30 30 @CRYPTO_LIBS@ \ 31 31 @INTLLIBS@ \ 32 @SYSTEMD_ DAEMON_LIBS@ \32 @SYSTEMD_LIBS@ \ 33 33 @ZLIB_LIBS@ \ 34 34 @PTHREAD_LIBS@ \ -
trunk/daemon/daemon.c
r14675 r14733 34 34 #include <libtransmission/watchdir.h> 35 35 36 #ifdef USE_SYSTEMD _DAEMON36 #ifdef USE_SYSTEMD 37 37 #include <systemd/sd-daemon.h> 38 38 #else
Note: See TracChangeset
for help on using the changeset viewer.