Merge branch 'dbus-1.4'

Conflicts:
	NEWS
	configure.ac
This commit is contained in:
Simon McVittie 2011-06-10 22:46:42 +01:00
commit 166bed249d
2 changed files with 4 additions and 4 deletions

6
NEWS
View file

@ -15,14 +15,14 @@ New things:
which can be used for source compatibility with older versions of libdbus.
• If GLib and DBus-GLib are already installed, more tests will be built,
providing better coverage. They can be installed via
providing better coverage. The new tests can also be installed via
./configure --enable-installed-tests
for system integration testing, if required. (fd.o #34570, Simon McVittie)
Changes:
• Consistently use atomic operations for the DBusConnection's refcount
(fd.o #38005, Simon McVittie)
• Consistently use atomic operations for the DBusConnection's refcount,
fixing potential threading problems (fd.o #38005, Simon McVittie)
• Don't use -Wl,--gc-sections by default: in practice the size decrease is
small (300KiB on x86-64) and it frequently doesn't work in unusual

View file

@ -135,7 +135,7 @@ installcheck_tests += $(installable_tests)
if DBUS_ENABLE_INSTALLED_TESTS
testexec_PROGRAMS += $(installable_tests)
else !DBUS_ENABLE_INSTALLED_TESTS
testexec_PROGRAMS += $(installable_tests)
noinst_PROGRAMS += $(installable_tests)
endif !DBUS_ENABLE_INSTALLED_TESTS
endif DBUS_ENABLE_MODULAR_TESTS