Merge branch 'my-dbus-1.2'

Conflicts:
	bus/Makefile.am
	dbus/dbus-sysdeps-util-unix.c
	dbus/dbus-transport.c
	test/test-service.c

diff --cc bus/Makefile.am
Simple merge

diff --cc bus/bus.c
Simple merge

diff --cc configure.in
Simple merge

diff --cc dbus/Makefile.am
index cabe2b0,597fe08..1c710ac
--- 1/dbus/Makefile.am
--- 2/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@@ -245,8 -171,11 +245,9 @@@ EXTRA_DIST=dbus-arch-deps.h.in dbus-1.d
  noinst_LTLIBRARIES=libdbus-convenience.la
  
  libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS)
 -## don't export symbols that start with "_" (we use this 
 -## convention for internal symbols)
 -libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined @R_DYNAMIC_LDFLAG@ @PIC_LDFLAGS@
 +libdbus_1_la_LDFLAGS= $(export_symbols) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined @R_DYNAMIC_LDFLAG@ @PIC_LDFLAGS@
  
+ libdbus_convenience_la_LIBADD=$(DBUS_CLIENT_LIBS)
  libdbus_convenience_la_LDFLAGS=@R_DYNAMIC_LDFLAG@
  
  ## note that TESTS has special meaning (stuff to use in make check)

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

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

diff --cc dbus/dbus-sysdeps.h
Simple merge

diff --cc test/test-service.c
index 2bd2dbc,9a129aa..93f59f1
--- 1/test/test-service.c
--- 2/test/test-service.c
+++ b/test/test-service.c
@@@ -409,9 -407,7 +409,11 @@@ main (int    argc
    else
      {
        name = argv[1];
 +#ifndef DBUS_WIN
        do_fork = strcmp (argv[2], "fork") == 0;
- #endif      
++#else
++      do_fork = FALSE;
++#endif
      }
  
    /* The bare minimum for simulating a program "daemonizing"; the intent
@@@ -427,7 -422,7 +429,8 @@@
          exit (0);
        sleep (1);
      }
 +#endif
+ 
    dbus_error_init (&error);
    connection = dbus_bus_get (DBUS_BUS_STARTER, &error);
    if (connection == NULL)