From 092849aa0b90856986d6484c555b46a29c8a5bbc Mon Sep 17 00:00:00 2001
From: Oleg Moskalenko <mom040267@gmail.com>
Date: Tue, 17 Nov 2015 01:05:05 -0800
Subject: [PATCH] hiredis and mongo config fix

---
 ChangeLog             |  5 +++++
 configure             | 11 ++++++++---
 rpm/build.settings.sh |  2 +-
 rpm/turnserver.spec   |  4 +++-
 src/ns_turn_defs.h    |  2 +-
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8698d224..778d66b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+11/17/2015 Oleg Moskalenko <mom040267@gmail.com>
+Version 4.5.0.4 'dan Eider':
+	- hiredis and mongo compilation configuration fixed
+	(fix provided by Harsha Bellur). 
+
 11/15/2015 Oleg Moskalenko <mom040267@gmail.com>
 Version 4.5.0.3 'dan Eider':
 	- SSLv3 support removed. That provides extra security and
diff --git a/configure b/configure
index 28a0625c..bc764783 100755
--- a/configure
+++ b/configure
@@ -63,9 +63,14 @@ testlibevent2_comp() {
 }
 
 testhiredis() {
-    HIREDISCFLAGS=
+    for inc in ${INCLUDEDIR}/hiredis /usr/local/include/hiredis /usr/hiredis /usr/include/hiredis
+    do
+        if [ -d ${inc} ] ; then
+            HIREDISCFLAGS="${HIREDISCFLAGS} -I${inc}"
+        fi
+    done
     HIREDISLIBS=-lhiredis
-    ${CC} ${HR_TMPCPROGC} -o ${HR_TMPCPROGB} ${OSCFLAGS} ${DBLIBS} ${HIREDISCFLAGS} ${HIREDISLIBS} 2>>/dev/null
+    ${CC} ${HR_TMPCPROGC} -o ${HR_TMPCPROGB} ${OSCFLAGS} ${DBLIBS} ${HIREDISCFLAGS} ${HIREDISLIBS} ${OSLIBS} 2>>/dev/null
     ER=$?
     if ! [ ${ER} -eq 0 ] ; then
 		${ECHO_CMD}
@@ -142,7 +147,7 @@ testlibmysql() {
 }
 
 testlibmongoc() {
-    for inc in ${PREFIX}/libmongoc-1.0 ${PREFIX}/libbson-1.0 /usr/local/include/libmongoc-1.0 /usr/local/include/libbson-1.0 /usr/libmongoc-1.0 /usr/libbson-1.0 /usr/include/libbson-1.0/ /usr/include/libmongoc-1.0/
+    for inc in ${INCLUDEDIR}/libmongoc-1.0 ${INCLUDEDIR}/libbson-1.0 /usr/local/include/libmongoc-1.0 /usr/local/include/libbson-1.0 /usr/libmongoc-1.0 /usr/libbson-1.0 /usr/include/libbson-1.0/ /usr/include/libmongoc-1.0/
     do
       if [ -d ${inc} ] ; then
         MONGO_CFLAGS="${MONGO_CFLAGS} -I${inc}"
diff --git a/rpm/build.settings.sh b/rpm/build.settings.sh
index cddc93e6..b5c3b6c7 100755
--- a/rpm/build.settings.sh
+++ b/rpm/build.settings.sh
@@ -2,7 +2,7 @@
 
 # Common settings script.
 
-TURNVERSION=4.5.0.3
+TURNVERSION=4.5.0.4
 BUILDDIR=~/rpmbuild
 ARCH=`uname -p`
 TURNSERVER_GIT_URL=https://github.com/coturn/coturn.git
diff --git a/rpm/turnserver.spec b/rpm/turnserver.spec
index ddf11fb2..99a99de3 100644
--- a/rpm/turnserver.spec
+++ b/rpm/turnserver.spec
@@ -1,5 +1,5 @@
 Name:		turnserver
-Version:	4.5.0.3
+Version:	4.5.0.4
 Release:	0%{dist}
 Summary:	Coturn TURN Server
 
@@ -290,6 +290,8 @@ fi
 %{_includedir}/turn/client/TurnMsgLib.h
 
 %changelog
+* Tue Nov 17 2015 Oleg Moskalenko <mom040267@gmail.com>
+  - Sync to 4.5.0.4
 * Sun Oct 11 2015 Oleg Moskalenko <mom040267@gmail.com>
   - Sync to 4.5.0.3
 * Tue Sep 29 2015 Oleg Moskalenko <mom040267@gmail.com>
diff --git a/src/ns_turn_defs.h b/src/ns_turn_defs.h
index 864e4642..e5092395 100644
--- a/src/ns_turn_defs.h
+++ b/src/ns_turn_defs.h
@@ -31,7 +31,7 @@
 #ifndef __IOADEFS__
 #define __IOADEFS__
 
-#define TURN_SERVER_VERSION "4.5.0.3"
+#define TURN_SERVER_VERSION "4.5.0.4"
 #define TURN_SERVER_VERSION_NAME "dan Eider"
 #define TURN_SOFTWARE "Coturn-" TURN_SERVER_VERSION " '" TURN_SERVER_VERSION_NAME "'"