Merge branch 'dbus-1.4' and update NEWS for master

Conflicts:
	NEWS

3 files changed, 7 insertions, 14 deletions

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 2e6ca1de..094773c9 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -269,20 +269,13 @@ libdbus_internal_la_CPPFLAGS = -DDBUS_STATIC_BUILD
 libdbus_internal_la_LIBADD=$(DBUS_CLIENT_LIBS)
 libdbus_internal_la_LDFLAGS=$(export_symbols_internal) @R_DYNAMIC_LDFLAG@
 
-## note that TESTS has special meaning (stuff to use in make check)
-## so if adding tests not to be run in make check, don't add them to
-## TESTS
+noinst_PROGRAMS =
+
 if DBUS_BUILD_TESTS
-TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus
-TESTS=dbus-test
-else
-TESTS=
+# We can't actually run this til we've reached test/
+noinst_PROGRAMS += dbus-test
 endif
 
-## we use noinst_PROGRAMS not check_PROGRAMS so that we build
-## even when not doing "make check"
-noinst_PROGRAMS=$(TESTS)
-
 dbus_test_SOURCES=				\
 	dbus-test-main.c
 
diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c
index e06886a1..f7859520 100644
--- a/dbus/dbus-message-util.c
+++ b/dbus/dbus-message-util.c
@@ -619,8 +619,8 @@ process_test_subdir (const DBusString          *test_base_dir,
         {
           if (_dbus_string_ends_with_c_str (&filename, ".message"))
             {
-              _dbus_warn ("Could not load %s, message builder language no longer supported\n",
-                          _dbus_string_get_const_data (&filename));
+              printf ("SKIP: Could not load %s, message builder language no longer supported\n",
+                      _dbus_string_get_const_data (&filename));
             }
           
           _dbus_verbose ("Skipping non-.message file %s\n",
diff --git a/dbus/dbus-test.c b/dbus/dbus-test.c
index deb4c932..1fbaf8c8 100644
--- a/dbus/dbus-test.c
+++ b/dbus/dbus-test.c
@@ -135,7 +135,7 @@ dbus_internal_do_not_use_run_tests (const char *test_data_dir, const char *speci
 
   check_memleaks ();
 #else
-  _dbus_warn ("recursive marshal tests disabled\n");
+  printf ("SKIP: recursive marshal tests disabled\n");
 #endif
 
   run_test ("byteswap", specific_test, _dbus_marshal_byteswap_test);