libsystemd-daemon and libsystemd-journal have been replaced by libsystemd

[michaelrsweet]

Version: 2.1-current
CUPS.org User: odyx

Hi,

Michael Biebl (Debian systemd maintainer) reported https://bugs.debian.org/779770 mentionning:

In systemd v209, released over a year 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.

He then offered a patch to fix this:

--- a/config-scripts/cups-startup.m4
+++ b/config-scripts/cups-startup.m4
@@ -56,11 +56,11 @@ if test x$enable_systemd != xno; then
AC_MSG_ERROR(Need pkg-config to enable systemd support.)
fi
else

•       AC_MSG_CHECKING(for libsystemd-daemon)
  

•            if $PKGCONFIG --exists libsystemd-daemon; then
  

•       AC_MSG_CHECKING(for libsystemd)
  

•            if $PKGCONFIG --exists libsystemd; then
                   AC_MSG_RESULT(yes)
  

•                    ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
  

•                    ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
  

•                    ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd`
  

•                    ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd`
                   AC_DEFINE(HAVE_SYSTEMD)
      if test "x$SYSTEMD_DIR" = x; then
              SYSTEMD_DIR="`$PKGCONFIG --variable=systemdsystemunitdir systemd`"
  

[michaelrsweet]

CUPS.org User: mike

Fixed in Subversion repository.

[michaelrsweet]

"str4669.patch":

Index: config-scripts/cups-startup.m4

--- config-scripts/cups-startup.m4 (revision 12783)
+++ config-scripts/cups-startup.m4 (working copy)
@@ -56,27 +56,19 @@
AC_MSG_ERROR(Need pkg-config to enable systemd support.)
fi
else

•       AC_MSG_CHECKING(for libsystemd-daemon)
  

•            if $PKGCONFIG --exists libsystemd-daemon; then
  

•       AC_MSG_CHECKING(for libsystemd)
  

•            if $PKGCONFIG --exists libsystemd; then
                   AC_MSG_RESULT(yes)
  

•                    ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
  

•                    ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
  

•                    ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd`
  

•                    ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd`
                   AC_DEFINE(HAVE_SYSTEMD)
  

•       AC_CHECK_HEADER(systemd/sd-journal.h,AC_DEFINE(HAVE_SYSTEMD_SD_JOURNAL_H))
      if test "x$SYSTEMD_DIR" = x; then
              SYSTEMD_DIR="`$PKGCONFIG --variable=systemdsystemunitdir systemd`"
                   fi
           else
                   AC_MSG_RESULT(no)
           fi
  

•       AC_MSG_CHECKING(for libsystemd-journal)
  

•            if $PKGCONFIG --exists libsystemd-journal; then
  

•                    AC_MSG_RESULT(yes)
  

•                    ONDEMANDFLAGS="$ONDEMANDFLAGS `$PKGCONFIG --cflags libsystemd-journal`"
  

•                    ONDEMANDLIBS="$ONDEMANDLIBS `$PKGCONFIG --libs libsystemd-journal`"
  

•       AC_CHECK_HEADER(systemd/sd-journal.h,AC_DEFINE(HAVE_SYSTEMD_SD_JOURNAL_H))
  

•            else
  

•                    AC_MSG_RESULT(no)
  

•            fi
   fi
  

  fi