net/kamailio/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,7 +5,6 @@ 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 @@ -16,8 +15,6 @@ HIREDIS_CLUSTER_BUILDER = $(shell \
  27                 echo 'pkg-config hiredis_cluster'; \
  28         fi)
  29
  30 -endif
  31 -
  32  ifeq ($(HIREDIS_BUILDER),)
  33         HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis -I/usr/include/hiredis
  34         HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis
  35 --- a/src/modules/ndb_redis/Makefile
  36 +++ b/src/modules/ndb_redis/Makefile
  37 @@ -5,12 +5,10 @@ include ../../Makefile.defs
  38  auto_gen=
  39  NAME=ndb_redis.so
  40
  41 -ifeq ($(CROSS_COMPILE),)
  42  HIREDIS_BUILDER = $(shell \
  43         if pkg-config --exists hiredis; then \
  44                 echo 'pkg-config hiredis'; \
  45         fi)
  46 -endif
  47
  48  ifeq ($(HIREDIS_BUILDER),)
  49         HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis  -I/usr/include/hiredis
  50 --- a/src/modules/topos_redis/Makefile
  51 +++ b/src/modules/topos_redis/Makefile
  52 @@ -5,12 +5,10 @@ include ../../Makefile.defs
  53  auto_gen=
  54  NAME=topos_redis.so
  55
  56 -ifeq ($(CROSS_COMPILE),)
  57  HIREDIS_BUILDER = $(shell \
  58         if pkg-config --exists hiredis; then \
  59                 echo 'pkg-config hiredis'; \
  60         fi)
  61 -endif
  62
  63  ifeq ($(HIREDIS_BUILDER),)
  64         HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis  -I/usr/include/hiredis