fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-09 07:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dbus-1.8'

Browse source 
Conflicts:
	NEWS
This commit is contained in:
Simon McVittie 2014-09-12 12:36:20 +01:00
commit 02731e3718
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
NEWS
View file

@ -45,6 +45,10 @@ Fixes:
(like Mac OS X 10.6), or available in libc but unsupported by the kernel
(fd.o #77032; rmvsxop, OBATA Akio, Patrick Welche)
• Check for libsystemd from systemd >= 209, falling back to
the older separate libraries if not found (Umut Tezduyar Lindskog,
Simon McVittie)
• Fix compilation with --enable-stats (fd.o #81043, Gentoo #507232;
Alban Crequy)
@ -53,6 +57,9 @@ Fixes:
• Change DBUS_TYPE_G_BYTE_ARRAY reference in dbus-tutorial.xml
to the correct DBUS_TYPE_G_UCHAR_ARRAY (fd.o #80795, Thomas Haller)
• Improve documentation for running tests on Windows (fd.o #41252,
Ralf Habacker)
D-Bus 1.8.6 (2014-06-02)
==

11
configure.ac
View file

@ -1146,10 +1146,13 @@ dnl systemd detection
if test x$enable_systemd = xno ; then
have_systemd=no;
else
PKG_CHECK_MODULES(SYSTEMD,
[libsystemd-login >= 32, libsystemd-daemon >= 32, libsystemd-journal >= 32],
have_systemd=yes,
have_systemd=no)
PKG_CHECK_MODULES([SYSTEMD],
[libsystemd >= 209],
[have_systemd=yes],
[PKG_CHECK_MODULES([SYSTEMD],
[libsystemd-login >= 32, libsystemd-daemon >= 32, libsystemd-journal >= 32],
[have_systemd=yes],
[have_systemd=no])])
fi
if test x$have_systemd = xyes; then