From 06a379d408036a41b93e22e9e7e5b557dfc30c02 Mon Sep 17 00:00:00 2001 From: Simo Piiroinen Date: Tue, 25 Apr 2017 13:04:10 +0300 Subject: [PATCH] [packaging] Adjust libsystemd build requirements The systemd development packages have changed and there are build time warnings like: sd_notify was moved to libsystemd. Do not use libsystemd-daemon. Use libsystemd as instructed. Signed-off-by: Simo Piiroinen --- configure.ac | 3 ++- rpm/usb-moded.spec | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 53cc476..1d006cc 100644 --- a/configure.ac +++ b/configure.ac @@ -75,7 +75,7 @@ AM_CONDITIONAL([CONNMAN], [test x$connman = xtrue]) AC_ARG_ENABLE([systemd], AS_HELP_STRING([--enable-systemd], [Enable systemd notify interface @<:@default=false@:>@]), [case "${enableval}" in - yes) systemd=true ; CFLAGS="-DSYSTEMD -lsystemd-daemon $CFLAGS" ;; + yes) systemd=true ; CFLAGS="-DSYSTEMD $CFLAGS" ;; no) systemd=false ;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-systemd]) ;; esac],[systemd=false]) @@ -98,6 +98,7 @@ PKG_CHECK_MODULES([USB_MODED], [ libudev libkmod ssu-sysinfo + libsystemd ]) AC_SUBST(USB_MODED_LIBS) diff --git a/rpm/usb-moded.spec b/rpm/usb-moded.spec index 27da403..972d831 100644 --- a/rpm/usb-moded.spec +++ b/rpm/usb-moded.spec @@ -14,7 +14,7 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(libkmod) BuildRequires: doxygen -BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(ssu-sysinfo) Requires: lsof