Merge branch 'dbus-1.4'

Conflicts:
	NEWS

diff --cc NEWS
index 9e142f2,f3fc318..8a156fa
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,8 -1,16 +1,18 @@@
 -D-Bus 1.4.16 (UNRELEASED)
 +D-Bus 1.5.8 (UNRELEASED)
  ==
  
 -The "this answerphone fails to answer the phone" release.
++The "cross-metering" release.
++
 +• Clean up dead code (fd.o #39231, Simon McVittie)
  
+ • If full test coverage is requested via --enable-tests, strictly require
+   Python, pygobject and dbus-python, which are required by some tests; if not,
+   and Python is missing, skip those tests rather than failing
+   (fd.o #37847, Simon McVittie)
+ 
+ • When using cmake, provide the same version-info API in the installed headers
+   as for autotools (DBUS_VERSION, etc.) (fd.o #40905, Ralf Habacker)
+ 
  • Add a regression test for fd.o #38005 (fd.o #39836, Simon McVittie)
  
  • Make "NOCONFIGURE=1 ./autogen.sh" not run configure (Colin Walters)

diff --cc bus/activation.c
Simple merge

diff --cc configure.ac
Simple merge

diff --cc dbus/dbus-sysdeps-unix.c
Simple merge

diff --cc dbus/dbus-sysdeps-util-unix.c
Simple merge

diff --cc test/Makefile.am
index d26b21f,0981d1f..fe4a919
--- 1/test/Makefile.am
--- 2/test/Makefile.am
+++ b/test/Makefile.am
@@@ -72,23 -52,59 +72,27 @@@ endif !DBUS_BUILD_TEST
  
  noinst_PROGRAMS= $(TEST_BINARIES)
  
 -test_service_SOURCES=                         \
 -      test-service.c
 -
 -test_names_SOURCES=                           \
 -      test-names.c
 -
 -##break_loader_SOURCES=                               \
 -##    break-loader.c
 -
 -test_shell_service_SOURCES =                  \
 -      test-shell-service.c
 -
 -shell_test_SOURCES=                             \
 -        shell-test.c
 -
 -spawn_test_SOURCES=                           \
 -      spawn-test.c
 -
 -test_exit_SOURCES =                           \
 -      test-exit.c
 -
 -test_segfault_SOURCES =                               \
 -      test-segfault.c
 -
 -test_sleep_forever_SOURCES =                  \
 -      test-sleep-forever.c
 -
 -# This assumes that most tests will be linked to libdbus-internal;
 -# tests linked to only the public libdbus have their own CPPFLAGS.
 -AM_CPPFLAGS=-DDBUS_STATIC_BUILD
 -TEST_LIBS=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
 -
 -test_service_LDADD=libdbus-testutils.la $(TEST_LIBS)
 -test_service_LDFLAGS=@R_DYNAMIC_LDFLAG@
 -test_names_LDADD=libdbus-testutils.la $(TEST_LIBS)
 -test_names_LDFLAGS=@R_DYNAMIC_LDFLAG@
 -## break_loader_LDADD= $(TEST_LIBS)
 -## break_loader_LDFLAGS=@R_DYNAMIC_LDFLAG@
 -test_shell_service_LDADD=libdbus-testutils.la $(TEST_LIBS)
 -test_shell_service_LDFLAGS=@R_DYNAMIC_LDFLAG@
 -shell_test_LDADD=libdbus-testutils.la $(TEST_LIBS)
 -shell_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
 -spawn_test_LDADD=$(TEST_LIBS)
 -spawn_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
 +test_service_CPPFLAGS = $(static_cppflags)
 +test_service_LDADD = libdbus-testutils.la
 +test_names_CPPFLAGS = $(static_cppflags)
 +test_names_LDADD = libdbus-testutils.la
 +## break_loader_CPPFLAGS = $(static_cppflags)
 +## break_loader_LDADD = $(top_builddir)/dbus/libdbus-internal.la
 +test_shell_service_CPPFLAGS = $(static_cppflags)
 +test_shell_service_LDADD = libdbus-testutils.la
 +shell_test_CPPFLAGS = $(static_cppflags)
 +shell_test_LDADD = libdbus-testutils.la
 +spawn_test_CPPFLAGS = $(static_cppflags)
 +spawn_test_LDADD = $(top_builddir)/dbus/libdbus-internal.la
  
  test_refs_SOURCES = internals/refs.c
 -test_refs_CPPFLAGS = -DDBUS_STATIC_BUILD $(GLIB_CFLAGS)
 -test_refs_LDADD = libdbus-testutils.la $(GLIB_LIBS) $(TEST_LIBS)
 +test_refs_CPPFLAGS = $(static_cppflags)
 +test_refs_LDADD = libdbus-testutils.la $(GLIB_LIBS)
  
+ test_syslog_SOURCES = internals/syslog.c
+ test_syslog_CPPFLAGS = -DDBUS_STATIC_BUILD $(GLIB_CFLAGS)
+ test_syslog_LDADD = libdbus-testutils.la $(GLIB_LIBS) $(TEST_LIBS)
+ 
  EXTRA_DIST = dbus-test-runner
  
  testexecdir = $(libdir)/dbus-1.0/test

diff --cc test/name-test/Makefile.am
Simple merge