[packaging] Adjust libsystemd build requirements. JB#37916

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 <simo.piiroinen@jollamobile.com>

Makefile.custom

@@ -219,7 +219,7 @@ PKG_NAMES += dsme_dbus_if
 PKG_NAMES += thermalmanager_dbus_if
 PKG_NAMES += libiphb
 PKG_NAMES += systemd
-PKG_NAMES += libsystemd-daemon
+PKG_NAMES += libsystemd
 PKG_NAMES += libngf0
 
 maintenance  = normalize clean distclean mostlyclean

configure.ac

@@ -212,6 +212,9 @@ PKG_CHECK_MODULES(DBUSGLIB, dbus-glib-1)
 if test "x$enable_vibra_feedback" != xno; then
 PKG_CHECK_MODULES(LIBNGF, libngf0 >= 0.24)
 fi
+if test "x$enable_systemd" != xno; then
+PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd)
+fi
 
 # Check libs (that are not yet checked)
 # Whitespaces in 'action-if-found' fields in order to not (auto)update LIBS variable

dsme/Makefile.am

@@ -30,11 +30,9 @@ dsme_SOURCES = dsme-wdd.c \
 
 
 dsme_CFLAGS = -g -std=c99 -Wall -Wwrite-strings -Wmissing-prototypes -Werror \
-              $(C_OPTFLAGS)
+              $(C_OPTFLAGS) $(LIBSYSTEMD_CFLAGS)
 dsme_LDFLAGS = -Wl,--as-needed
-if WANT_SYSTEMD
-dsme_LDADD   = -L/lib -lsystemd-daemon
-endif
+dsme_LDADD = $(LIBSYSTEMD_LIBS)
 
 #
 # dsme-server

rpm/dsme.spec

@@ -20,7 +20,7 @@ BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(libiphb) >= 1.2.0
 BuildRequires:  pkgconfig(dsme) >= 0.63.2
-BuildRequires:  pkgconfig(systemd)
+BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(mce) >= 1.12.3
 BuildRequires:  pkgconfig(libngf0) >= 0.24
 BuildRequires:  python