From 6dfa6857ee8e9b0f8f1e4777dc2d4f3b4fdc5cef Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Sun, 28 Sep 2014 14:05:57 +0200
Subject: [PATCH] windows fixes

---
 README.mingw   | 2 ++
 configure.ac   | 2 +-
 mediastreamer2 | 2 +-
 oRTP           | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.mingw b/README.mingw
index 57c0851c4..5e859680b 100644
--- a/README.mingw
+++ b/README.mingw
@@ -60,6 +60,8 @@ General rules for compilation
 - all other commands (configure, autogen.sh, make) must be done within the mingw shell (msys).
 In both msys and msys-git windows, change into the directory you created for sources:
 cd /c/sources
+- make sure pkg-config works by adding this env variable to your terminal:
+   export PKG_CONFIG_PATH=/usr/lib/pkgconfig
 
 Building belle-sip
 ******************
diff --git a/configure.ac b/configure.ac
index f584f5b9a..e28cb2180 100644
--- a/configure.ac
+++ b/configure.ac
@@ -899,7 +899,7 @@ dnl # Check for doxygen
 dnl ##################################################
 
 AC_PATH_PROG(DOXYGEN,doxygen,false)
-AM_CONDITIONAL(HAVE_DOXYGEN, test $DOXYGEN != false)
+AM_CONDITIONAL(HAVE_DOXYGEN, test "$DOXYGEN" != "false")
 
 
 AC_CONFIG_FILES([
diff --git a/mediastreamer2 b/mediastreamer2
index 1e40c9732..f6f1d4e98 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 1e40c9732712151197aac8830967fa61a23c280b
+Subproject commit f6f1d4e9804a9e3ba625621ccfaf562782642ff9
diff --git a/oRTP b/oRTP
index 72de9096d..89ca6ec13 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 72de9096de5e4aba0dfd9dbcb4406a6753e7fe68
+Subproject commit 89ca6ec136b325e4b51e40c6de6b7ab8b2d72432