Commit 2f42800e authored by Sandrine Avakian's avatar Sandrine Avakian

Merge branch 'master' into socket_api

* master:
  correct log
  Fix build with Autotools
parents 9c4b76c9 7c5bb0a4
......@@ -17,12 +17,16 @@ rpm:
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = belle-sip.pc
EXTRA_DIST=belle-sip.spec belle-sip.spec.in autogen.sh
EXTRA_DIST += CMakeLists.txt \
cmake/BelleSIPConfig.cmake.in \
cmake/FindAntlr3.cmake \
cmake/FindZlib.cmake \
config.h.cmake \
include/CMakeLists.txt \
src/CMakeLists.txt \
tester/CMakeLists.txt
EXTRA_DIST= \
belle-sip.spec \
belle-sip.spec.in \
autogen.sh \
CMakeLists.txt \
cmake/BelleSIPConfig.cmake.in \
cmake/FindAntlr3.cmake \
cmake/FindZlib.cmake \
config.h.cmake \
include/CMakeLists.txt \
src/CMakeLists.txt \
tester/CMakeLists.txt \
README.md
......@@ -25,7 +25,7 @@ AC_CANONICAL_SYSTEM
dnl initialize pkg-config so that we can use it within if else fi statements.
PKG_PROG_PKG_CONFIG()
AM_INIT_AUTOMAKE([subdir-objects])
AM_INIT_AUTOMAKE([subdir-objects foreign])
AM_SILENT_RULES(yes)
# Checks for programs.
......
......@@ -71,7 +71,7 @@ static void transaction_background_task_ended(belle_sip_transaction_t *obj){
static void transaction_begin_background_task(belle_sip_transaction_t *obj){
if (obj->bg_task_id==0){
obj->bg_task_id=belle_sip_begin_background_task("belle-sip transaction",(void (*)(void*))transaction_background_task_ended, obj);
if (obj->bg_task_id) belle_sip_message("channel [%p]: starting transaction background task with id=[%lx].",obj,obj->bg_task_id);
if (obj->bg_task_id) belle_sip_message("Transaction [%p]: starting transaction background task with id=[%lx].",obj,obj->bg_task_id);
}
}
......
......@@ -37,6 +37,7 @@ belle_sip_parse_SOURCES=parse.c
belle_http_get_SOURCES=get.c
belle_sip_resolve_SOURCES=resolve.c
belle_sip_resolve_CFLAGS=$(TLS_CFLAGS)
AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/src
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment