net/kamailio/patches/007-modules_build.patch

   1 --- a/modules/carrierroute/Makefile
   2 +++ b/modules/carrierroute/Makefile
   3 @@ -12,10 +12,8 @@ NAME=carrierroute.so
   4  BUILDER = $(shell which confuse-config)
   5
   6  ifeq ($(BUILDER),)
   7 -       CONFUSEDEFS=-I$(LOCALBASE)/include -I/usr/local/include -I/opt/include \
   8 -               -I/usr/sfw/include
   9 -       CONFUSELIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -L/usr/sfw/lib \
  10 -               -L/opt/lib -lconfuse
  11 +       CONFUSEDEFS=-I$(LOCALBASE)/include
  12 +       CONFUSELIBS=-L$(LOCALBASE)/lib
  13  else
  14                 CONFUSEDEFS = $(shell confuse-config --cflags)
  15                 CONFUSELIBS = $(shell confuse-config --libs)
  16 --- a/modules/h350/Makefile
  17 +++ b/modules/h350/Makefile
  18 @@ -9,7 +9,8 @@ include ../../Makefile.defs
  19
  20  auto_gen=
  21  NAME=h350.so
  22 -LIBS=
  23 +
  24  DEFS+=-I$(LOCALBASE)/include
  25 +LIBS=-L$(LOCALBASE)/lib -lldap
  26
  27  include ../../Makefile.modules
  28 --- a/modules/ldap/Makefile
  29 +++ b/modules/ldap/Makefile
  30 @@ -12,8 +12,8 @@ include ../../Makefile.defs
  31  auto_gen=
  32  NAME=ldap.so
  33
  34 -LIBS=-L$(LOCALBASE)/lib -lldap
  35  DEFS+=-I$(LOCALBASE)/include
  36 +LIBS=-L$(LOCALBASE)/lib -lldap
  37
  38  ifeq ($(OS),solaris)
  39         DEFS+=-I$(LOCALBASE)/include -I/usr/sfw/include -I/usr/local/include -I/opt/sfw/include -I/opt/csw/include
  40 --- a/modules/pua_bla/Makefile
  41 +++ b/modules/pua_bla/Makefile
  42 @@ -9,8 +9,8 @@ include ../../Makefile.defs
  43  auto_gen=
  44  NAME=pua_bla.so
  45  LIBS=
  46 -DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include
  47 -LIBS+=-L/usr/include/lib  -L$(LOCALBASE)/lib -lxml2
  48 +DEFS+=-I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include
  49 +LIBS+=-L$(LOCALBASE)/lib -lxml2
  50
  51  include ../../Makefile.modules
  52
  53 --- a/modules/pua_xmpp/Makefile
  54 +++ b/modules/pua_xmpp/Makefile
  55 @@ -10,7 +10,7 @@ auto_gen=
  56  NAME= pua_xmpp.so
  57  LIBS=
  58
  59 -DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include
  60 -LIBS+=-L/usr/include/lib  -L$(LOCALBASE)/lib -lxml2
  61 +DEFS+=-I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include
  62 +LIBS+=-L$(LOCALBASE)/lib -lxml2
  63
  64  include ../../Makefile.modules
  65 --- a/modules/regex/Makefile
  66 +++ b/modules/regex/Makefile
  67 @@ -7,10 +7,8 @@ NAME=regex.so
  68  BUILDER = $(shell which pcre-config)
  69
  70  ifeq ($(BUILDER),)
  71 -       PCREDEFS=-I$(LOCALBASE)/include -I/usr/local/include -I/opt/include \
  72 -       -I/usr/sfw/include
  73 -       PCRELIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -L/usr/sfw/lib \
  74 -       -L/opt/lib -lpcre
  75 +       PCREDEFS=-I$(LOCALBASE)/include
  76 +       PCRELIBS=-L$(LOCALBASE)/lib -lpcre
  77  else
  78         PCREDEFS = $(shell pcre-config --cflags)
  79         PCRELIBS = $(shell pcre-config --libs)
  80 --- a/modules/tlsops/Makefile
  81 +++ b/modules/tlsops/Makefile
  82 @@ -7,8 +7,8 @@ auto_gen=
  83  NAME=tlsops.so
  84  LIBS=
  85
  86 -DEFS+= -I$(LOCALBASE)/ssl/include
  87 -LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl  -lcrypto
  88 +DEFS+= -I$(LOCALBASE)/include
  89 +LIBS+= -L$(LOCALBASE)/lib -lssl  -lcrypto
  90
  91  include ../../Makefile.modules
  92
  93 --- a/modules/dialplan/Makefile
  94 +++ b/modules/dialplan/Makefile
  95 @@ -9,10 +9,8 @@ NAME=dialplan.so
  96  BUILDER = $(shell which pcre-config)
  97
  98  ifeq ($(BUILDER),)
  99 -       PCREDEFS=-I$(LOCALBASE)/include -I/usr/local/include -I/opt/include \
 100 -       -I/usr/sfw/include
 101 -       PCRELIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -L/usr/sfw/lib \
 102 -       -L/opt/lib -lpcre
 103 +       PCREDEFS=-I$(LOCALBASE)/include
 104 +       PCRELIBS=-L$(LOCALBASE)/lib -lpcre
 105  else
 106         PCREDEFS = $(shell pcre-config --cflags)
 107         PCRELIBS = $(shell pcre-config --libs)
 108 --- a/modules/lcr/Makefile
 109 +++ b/modules/lcr/Makefile
 110 @@ -11,10 +11,8 @@ NAME=lcr.so
 111  BUILDER = $(shell which pcre-config)
 112
 113  ifeq ($(BUILDER),)
 114 -       PCREDEFS=-I$(LOCALBASE)/include -I/usr/local/include -I/opt/include \
 115 -       -I/usr/sfw/include
 116 -       PCRELIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -L/usr/sfw/lib \
 117 -       -L/opt/lib -lpcre
 118 +       PCREDEFS=-I$(LOCALBASE)/include
 119 +       PCRELIBS=-L$(LOCALBASE)/lib -lpcre
 120  else
 121         PCREDEFS = $(shell pcre-config --cflags)
 122         PCRELIBS = $(shell pcre-config --libs)
 123 --- a/modules/purple/Makefile
 124 +++ b/modules/purple/Makefile
 125 @@ -3,9 +3,9 @@ auto_gen=
 126  NAME=purple.so
 127  LIBS=
 128
 129 -DEFS+=-I/usr/lib/glib-2.0/include -I/usr/include/glib-2.0 \
 130 -               -I/usr/include/libxml2
 131 -LIBS+=-lglib-2.0 -lpurple -lxml2
 132 +DEFS+=-I$(LOCALBASE)/include/glib-2.0/include -I$(LOCALBASE)/include/glib-2.0 \
 133 +               -I$(LOCALBASE)/incldue/libxml2
 134 +LIBS+=-L$(LOCALBASE)/lib -lglib-2.0 -lpurple -lxml2
 135
 136
 137  include ../../Makefile.modules