net/kamailio-5.x/patches/140-redis_use_pkg-config.patch

   1 --- a/src/modules/cnxcc/Makefile
   2 +++ b/src/modules/cnxcc/Makefile
   3 @@ -8,12 +8,10 @@ include ../../Makefile.defs
   4  auto_gen=
   5  NAME=cnxcc.so
   6
   7 -ifeq ($(CROSS_COMPILE),)
   8  HIREDIS_BUILDER = $(shell \
   9         if pkg-config --exists hiredis; then \
  10                 echo 'pkg-config hiredis'; \
  11         fi)
  12 -endif
  13
  14  ifeq ($(HIREDIS_BUILDER),)
  15         HIREDISDEFS=-I$(LOCALBASE)/include
  16 --- a/src/modules/db_redis/Makefile
  17 +++ b/src/modules/db_redis/Makefile
  18 @@ -5,12 +5,10 @@ include ../../Makefile.defs
  19  auto_gen=
  20  NAME=db_redis.so
  21
  22 -ifeq ($(CROSS_COMPILE),)
  23  HIREDIS_BUILDER = $(shell \
  24         if pkg-config --exists hiredis; then \
  25                 echo 'pkg-config hiredis'; \
  26         fi)
  27 -endif
  28
  29  ifeq ($(HIREDIS_BUILDER),)
  30         HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis -I/usr/include/hiredis
  31 @@ -19,7 +17,7 @@ else
  32         HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags)
  33         HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs)
  34
  35 -ifeq (,$(findstring hiredis,$(HIREDISDEFS)))
  36 +ifneq (,$(findstring hiredis,$(HIREDISDEFS)))
  37         DEFS+=-DWITH_HIREDIS_PATH
  38  endif
  39
  40 --- a/src/modules/ndb_redis/Makefile
  41 +++ b/src/modules/ndb_redis/Makefile
  42 @@ -5,12 +5,10 @@ include ../../Makefile.defs
  43  auto_gen=
  44  NAME=ndb_redis.so
  45
  46 -ifeq ($(CROSS_COMPILE),)
  47  HIREDIS_BUILDER = $(shell \
  48         if pkg-config --exists hiredis; then \
  49                 echo 'pkg-config hiredis'; \
  50         fi)
  51 -endif
  52
  53  ifeq ($(HIREDIS_BUILDER),)
  54         HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis  -I/usr/include/hiredis
  55 @@ -19,7 +17,7 @@ else
  56         HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags)
  57         HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs)
  58
  59 -ifeq (,$(findstring hiredis,$(HIREDISDEFS)))
  60 +ifneq (,$(findstring hiredis,$(HIREDISDEFS)))
  61         DEFS+=-DWITH_HIREDIS_PATH
  62  endif
  63
  64 --- a/src/modules/topos_redis/Makefile
  65 +++ b/src/modules/topos_redis/Makefile
  66 @@ -5,12 +5,10 @@ include ../../Makefile.defs
  67  auto_gen=
  68  NAME=topos_redis.so
  69
  70 -ifeq ($(CROSS_COMPILE),)
  71  HIREDIS_BUILDER = $(shell \
  72         if pkg-config --exists hiredis; then \
  73                 echo 'pkg-config hiredis'; \
  74         fi)
  75 -endif
  76
  77  ifeq ($(HIREDIS_BUILDER),)
  78         HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis  -I/usr/include/hiredis
  79 @@ -19,7 +17,7 @@ else
  80         HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags)
  81         HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs)
  82
  83 -ifeq (,$(findstring hiredis,$(HIREDISDEFS)))
  84 +ifneq (,$(findstring hiredis,$(HIREDISDEFS)))
  85         DEFS+=-DWITH_HIREDIS_PATH
  86  endif
  87