[sr-dev] git:master:0da66e70: db_redis: update to hiredis.h include path and deal with broken pkg-config spec

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 0da66e70bfc390e310f05da0d7ed9a7d1eb7c599
URL: https://github.com/kamailio/kamailio/commit/0da66e70bfc390e310f05da0d7ed9a7d1eb7c599

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2018-02-14T11:25:30+01:00

db_redis: update to hiredis.h include path and deal with broken pkg-config spec

- fix for broken output of pkg-config for hiredis
- same for ndb_redis from 4a40dd39cec713c569dc3480c905d808026aad39

---

Modified: src/modules/db_redis/Makefile
Modified: src/modules/db_redis/redis_connection.h

---

Diff:  https://github.com/kamailio/kamailio/commit/0da66e70bfc390e310f05da0d7ed9a7d1eb7c599.diff
Patch: https://github.com/kamailio/kamailio/commit/0da66e70bfc390e310f05da0d7ed9a7d1eb7c599.patch

---

diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile
index 2aec964196..58ecd04d36 100644
--- a/src/modules/db_redis/Makefile
+++ b/src/modules/db_redis/Makefile
@@ -18,6 +18,12 @@ ifeq ($(HIREDIS_BUILDER),)
 else
 	HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags)
 	HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs)
+
+ifeq ($(HIREDISLIBS),-L -lhiredis)
+		HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) /opt/local/include
+		HIREDISLIBS = -L/opt/local/lib -lhiredis
+endif
+
 endif
 
 DEFS+=$(HIREDISDEFS)
diff --git a/src/modules/db_redis/redis_connection.h b/src/modules/db_redis/redis_connection.h
index d6ed4e4ec3..35d58e46a4 100644
--- a/src/modules/db_redis/redis_connection.h
+++ b/src/modules/db_redis/redis_connection.h
@@ -23,7 +23,7 @@
 #ifndef _REDIS_CONNECTION_H_
 #define _REDIS_CONNECTION_H_
 
-#include <hiredis.h>
+#include <hiredis/hiredis.h>
 
 #include "db_redis_mod.h"