m4/systemd.m4 | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
New commits:
commit b36a31526355be64943f468cc52ca90bccdf42f1
Author: William Brown <firstyear(a)redhat.com>
Date: Mon May 23 11:12:17 2016 +1000
Ticket 48849 - Systemd introduced incompatible changes that breaks ds build
Bug Description: In rawhide systemd removed a number of libraries in favour
of a monolithic version. This breaks our build that expected systemd modules.
Fix Description: Change our systemd.m4 to use the monolithic library
https://fedorahosted.org/389/ticket/48849
Author: wibrown
Review by: nhosoi (Thanks!{
diff --git a/m4/systemd.m4 b/m4/systemd.m4
index a6dd302..629f5ee 100644
--- a/m4/systemd.m4
+++ b/m4/systemd.m4
@@ -39,24 +39,18 @@ if test "$with_systemd" = yes; then
AC_PATH_PROG(PKG_CONFIG, pkg-config)
AC_MSG_CHECKING(for Systemd with pkg-config)
- if test "$with_journald" = yes; then
- if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists systemd
libsystemd-journal libsystemd-daemon ; then
- systemd_inc=`$PKG_CONFIG --cflags-only-I systemd libsystemd-journal
libsystemd-daemon`
- systemd_lib=`$PKG_CONFIG --libs-only-l systemd libsystemd-journal
libsystemd-daemon`
- systemd_defs="-DWITH_SYSTEMD -DHAVE_JOURNALD"
- else
- AC_MSG_ERROR([no Systemd / Journald pkg-config files])
- fi
+ if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists libsystemd ; then
+ systemd_inc=`$PKG_CONFIG --cflags-only-I libsystemd`
+ systemd_lib=`$PKG_CONFIG --libs-only-l libsystemd`
else
+ AC_MSG_ERROR([no Systemd pkg-config files])
+ fi
- if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists systemd
libsystemd-daemon ; then
- systemd_inc=`$PKG_CONFIG --cflags-only-I systemd libsystemd-daemon`
- systemd_lib=`$PKG_CONFIG --libs-only-l systemd libsystemd-daemon`
- systemd_defs="-DWITH_SYSTEMD"
- else
- AC_MSG_ERROR([no Systemd pkg-config files])
- fi
+ if test "$with_journald" = yes; then
+ systemd_defs="-DWITH_SYSTEMD -DHAVE_JOURNALD"
+ else
+ systemd_defs="-DWITH_SYSTEMD"
fi
# Check for the pkg config provided unit paths