kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-10690: [libblade] Added PCRE to linux build, which can be used from system packages

This commit is contained in:
Shane Bryldt 2017-10-02 13:29:06 -05:00
parent 62ee80962f
commit 560fd03842
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/libblade/Makefile.am
View File

@ -26,9 +26,9 @@ libblade_la_SOURCES += src/blade_identity.c src/blade_rpc.c src/blade_connection
libblade_la_SOURCES += src/blade_protocol.c src/blade_subscription.c src/blade_channel.c
libblade_la_SOURCES += src/blade_transport.c src/blade_transport_wss.c
libblade_la_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
libblade_la_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(PCRE_CFLAGS)
libblade_la_LDFLAGS = -version-info 0:1:0 -lncurses -lpthread -lm -lconfig -lcivetweb $(AM_LDFLAGS)
libblade_la_LIBADD = libunqlite.la
libblade_la_LIBADD = libunqlite.la $(PCRE_LIBS)
library_includedir = $(prefix)/include
library_include_HEADERS = src/include/blade.h src/include/blade_types.h src/include/blade_stack.h
@ -45,11 +45,11 @@ $(CIVETWEB_LIB): $(CIVETWEB_DIR)
cd $(CIVETWEB_DIR) && $(MAKE) lib USE_STACK_SIZE=102400 MAX_REQUEST_SIZE=16384 WITH_LUA=1 LUA_COMPAT_ALL=1 USE_LUA_SQLITE3=1 USE_LUA_FILE_SYSTEM=1 WITH_IPV6=1 WITH_WEBSOCKET=1 && $(MAKE) lib USE_STACK_SIZE=102400 MAX_REQUEST_SIZE=16384 WITH_LUA=1 LUA_COMPAT_ALL=1 USE_LUA_SQLITE3=1 USE_LUA_FILE_SYSTEM=1 WITH_IPV6=1 WITH_WEBSOCKET=1 WITH_DUKTAPE=1
$(CIVETWEB_DIR):
$(GETLIB) $(CIVETWEB).tar.gz
$(GETLIB) $(CIVETWEB).tar.gz
$(LIBKS):
cd $(top_srcdir)/../libks && /bin/sh ./bootstrap.sh && /bin/sh ./configure && $(MAKE)
tests: libblade.la
$(MAKE) -C test tests

1
libs/libblade/configure.ac
View File

@ -251,6 +251,7 @@ fi
PKG_CHECK_MODULES([SODIUM], [libsodium >= 1.0.0],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([libsodium is required])])
PKG_CHECK_MODULES([LIBKS], [libks >= 0.1],[AC_MSG_RESULT([yes])],[AC_MSG_WARN([libks is required, but not found.])])
PKG_CHECK_MODULES([PCRE], [libpcre >= 7.8])
# Enable clang address sanitizer bit build
AC_ARG_ENABLE(address_sanitizer,

2
libs/libblade/src/blade_restmgr.c
View File

@ -293,7 +293,7 @@ KS_DECLARE(ks_status_t) blade_restmgr_data_set(blade_restmgr_t *brestmgr, void *
int blade_restmgr_handle_begin_request(struct mg_connection *conn)
{
struct mg_request_info *info = mg_get_request_info(conn);
const struct mg_request_info *info = mg_get_request_info(conn);
ks_log(KS_LOG_DEBUG, "Request for: %s on %s\n", info->request_uri, info->request_method);

1
libs/libblade/src/include/blade.h
View File

@ -38,6 +38,7 @@
#include <sodium.h>
#include <libconfig.h>
#include <civetweb.h>
#include <pcre.h>
#include "unqlite.h"
#include "blade_types.h"
#include "blade_stack.h"