Merge remote-tracking branch 'mkbosmans/mingw32-build'
authorColin Guthrie <cguthrie@mandriva.org>
Fri, 25 Feb 2011 09:24:07 +0000 (09:24 +0000)
committerColin Guthrie <cguthrie@mandriva.org>
Fri, 25 Feb 2011 09:24:07 +0000 (09:24 +0000)
1  2 
configure.ac
src/Makefile.am

diff --cc configure.ac
@@@ -1683,12 -1727,12 +1727,12 @@@ echo 
      Preopened modules:             ${PREOPEN_MODS}
  "
  
- if test "${ENABLE_DBUS}" = "no" ; then
+ if test "${ENABLE_DBUS}" = "no" && test "x$os_is_win32" != "x1" ; then
     echo "
  ===== WARNING WARNING WARNING WARNING WARNING WARNING WARNING =====
 -You do not have DBUS support enabled. It is strongly recommended
 -that you enable DBUS support if you platform supports it.
 -Many parts of PulseAudio use udev, from Console Kit interaction
 +You do not have D-Bus support enabled. It is strongly recommended
 +that you enable D-Bus support if your platform supports it.
 +Many parts of PulseAudio use D-Bus, from ConsoleKit interaction
  to the Device Reservation Protocol to speak to JACK, Bluetooth
  support and even a native control protocol for communicating and
  controling the PulseAudio daemon itself.
diff --cc src/Makefile.am
Simple merge