Merge remote-tracking branch 'mkbosmans/mingw32-build'

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.am
index 78ee231f2f752c29c4da515e74e292c58a22ecf4,f160c944285e86dd0041331d73cd3201bfff2ec3..fca7edad9b9130b62b87c32c694741b73cb745cb
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1917,16 -1898,23 +1918,23 @@@ system.pa: daemon/system.pa.in Makefil
  endif
  
  daemon.conf: daemon/daemon.conf.in Makefile
 -      sed -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
 +      $(AM_V_GEN) sed -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
                -e 's,@PA_DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@
  
+ if OS_IS_WIN32
+ SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp
+ else
+ SYMLINK_PROGRAM=ln -sf
+ endif
  install-exec-hook:
+ if HAVE_BLUEZ
        -chown root $(DESTDIR)$(pulselibexecdir)/proximity-helper
        -chmod u+s $(DESTDIR)$(pulselibexecdir)/proximity-helper
-       ln -sf pacat $(DESTDIR)$(bindir)/parec
-       ln -sf pacat $(DESTDIR)$(bindir)/pamon
-       ln -sf pacat $(DESTDIR)$(bindir)/paplay
-       ln -sf pacat $(DESTDIR)$(bindir)/parecord
+ endif
+       $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parec$(EXEEXT)
+       $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/pamon$(EXEEXT)
+       $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/paplay$(EXEEXT)
+       $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parecord$(EXEEXT)
        rm -f $(DESTDIR)$(libdir)/libpulsedsp.la
        rm -f $(DESTDIR)$(modlibexecdir)/*.la
  

diff --cc src/daemon/daemon-conf.c
Simple merge

diff --cc src/modules/module-protocol-stub.c
Simple merge

diff --cc src/modules/module-waveout.c
Simple merge

diff --cc src/modules/raop/raop_client.c
Simple merge

diff --cc src/modules/rtp/rtsp_client.c
Simple merge

diff --cc src/pulsecore/core-util.c
Simple merge

diff --cc src/pulsecore/ipacl.c
Simple merge