Commit 62337be8 authored by Emmanuel Milou's avatar Emmanuel Milou

[#1224] Upgrade to pjsip 1.0.2

parent 868afabc

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -407,6 +407,6 @@ AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir
AC_SUBST(SFLPHONE_CFLAGS)
AC_SUBST(SFLPHONE_LIBS)
AC_OUTPUT
AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-1.0.1) has already been compiled. Run `make' to build the software.]])
AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-1.0.2) has already been compiled. Run `make' to build the software.]])
......@@ -3,13 +3,15 @@ src=$(top_srcdir)
sflcodecdir=$(DESTDIR)$(libdir)/sflphone/codecs
sflplugindir=$(DESTDIR)$(libdir)/sflphone/plugins
PJSIP_VERSION="1.0.2"
# for pjsip
PJSIP_LIBS= \
-L$(src)/libs/pjproject-1.0.1/pjnath/lib/ \
-L$(src)/libs/pjproject-1.0.1/pjsip/lib/ \
-L$(src)/libs/pjproject-1.0.1/pjlib/lib/ \
-L$(src)/libs/pjproject-1.0.1/pjlib-util/lib/ \
-L$(src)/libs/pjproject-1.0.1/pjmedia/lib/ \
-L$(src)/libs/pjproject-$(PJSIP_VERSION)/pjnath/lib/ \
-L$(src)/libs/pjproject-$(PJSIP_VERSION)/pjsip/lib/ \
-L$(src)/libs/pjproject-$(PJSIP_VERSION)/pjlib/lib/ \
-L$(src)/libs/pjproject-$(PJSIP_VERSION)/pjlib-util/lib/ \
-L$(src)/libs/pjproject-$(PJSIP_VERSION)/pjmedia/lib/ \
-lpjnath-sfl-$(target) \
-lpjsua-sfl-$(target) \
-lpjsip-sfl-$(target) \
......@@ -20,11 +22,11 @@ PJSIP_LIBS= \
-lpjlib-util-sfl-$(target) \
-lpj-sfl-$(target)
SIP_CFLAGS=-I$(src)/libs/pjproject-1.0.1/pjsip/include \
-I$(src)/libs/pjproject-1.0.1/pjlib/include \
-I$(src)/libs/pjproject-1.0.1/pjlib-util/include \
-I$(src)/libs/pjproject-1.0.1/pjmedia/include \
-I$(src)/libs/pjproject-1.0.1/pjnath/include
SIP_CFLAGS=-I$(src)/libs/pjproject-$(PJSIP_VERSION)/pjsip/include \
-I$(src)/libs/pjproject-$(PJSIP_VERSION)/pjlib/include \
-I$(src)/libs/pjproject-$(PJSIP_VERSION)/pjlib-util/include \
-I$(src)/libs/pjproject-$(PJSIP_VERSION)/pjmedia/include \
-I$(src)/libs/pjproject-$(PJSIP_VERSION)/pjnath/include
DBUSCPP_CFLAGS=$(top_srcdir)/libs/dbus-c++/include/dbus-c++
......@@ -45,7 +47,7 @@ AM_CPPFLAGS = \
-I$(src)/libs \
-I$(src)/libs/dbus-c++/include \
-I$(src)/libs/iax2 \
-I$(src)/libs/pjproject-1.0.1 \
-I$(src)/libs/pjproject-$(PJSIP_VERSION) \
-I$(src)/src \
-I$(src)/src/config \
-I$(src)/test \
......
include build.mak
include build/host-$(HOST_NAME).mak
DIRS = pjlib pjlib-util pjnath third_party pjmedia pjsip pjsip-apps
ifdef MINSIZE
MAKE_FLAGS := MINSIZE=1
endif
all clean dep depend distclean print realclean:
for dir in $(DIRS); do \
if $(MAKE) $(MAKE_FLAGS) -C $$dir/build $@; then \
true; \
else \
exit 1; \
fi; \
done
doc:
@if test \( ! "$(WWWDIR)" == "" \) -a \( ! -d $(WWWDIR)/pjlib/docs/html \) ; then \
echo 'Directory "$(WWWDIR)" does not look like a valid pjsip web directory'; \
exit 1; \
fi
for dir in $(DIRS); do \
if $(MAKE) $(MAKE_FLAGS) -C $$dir/build $@; then \
true; \
else \
exit 1; \
fi; \
done
LIBS = pjlib/lib/libpj-sfl-$(TARGET_NAME).a \
pjlib-util/lib/libpjlib-util-sfl-$(TARGET_NAME).a \
pjnath/lib/libpjnath-sfl-$(TARGET_NAME).a \
pjmedia/lib/libpjmedia-sfl-$(TARGET_NAME).a \
pjmedia/lib/libpjmedia-codec-sfl-$(TARGET_NAME).a \
pjsip/lib/libpjsip-sfl-$(TARGET_NAME).a \
pjsip/lib/libpjsip-ua-sfl-$(TARGET_NAME).a \
pjsip/lib/libpjsip-simple-sfl-$(TARGET_NAME).a \
pjsip/lib/libpjsua-sfl-$(TARGET_NAME).a
BINS = pjsip-apps/bin/pjsua-sfl-$(TARGET_NAME)$(HOST_EXE)
size:
@echo -n 'Date: '
@date
@echo
@for lib in $(LIBS); do \
echo "$$lib:"; \
size -t $$lib | awk '{print $$1 "\t" $$2 "\t" $$3 "\t" $$6}'; \
echo; \
done
@echo
@for bin in $(BINS); do \
echo "size $$bin:"; \
size $$bin; \
done
#dos2unix:
# for f in `find . | egrep '(mak|h|c|S|s|Makefile)$$'`; do \
# dos2unix "$$f" > dos2unix.tmp; \
# cp dos2unix.tmp "$$f"; \
# done
# rm -f dos2unix.tmp
xhdrid:
for f in `find . | egrep '\.(h|c|S|s|cpp|hpp)$$'`; do \
echo Processing $$f...; \
cat $$f | sed 's/.*\$$Author\$$/ */' > /tmp/id; \
cp /tmp/id $$f; \
done
prefix = /usr/local
install:
mkdir -p $(DESTDIR)$(prefix)/lib
cp -L $$(find . -name '*.a') $(DESTDIR)$(prefix)/lib
mkdir -p $(DESTDIR)$(prefix)/include
cp -RL $$(find . -name include) $(DESTDIR)$(prefix)
cd $(DESTDIR)$(prefix)/lib && for i in $$(find . -name 'libpj*a'); do\
ln -s $$i $$(echo $$i | sed -e "s/-$(TARGET_NAME)//");\
done
mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig
sed -e "s!@PREFIX@!$(DESTDIR)$(prefix)!" libpj-sfl.pc.in > $(DESTDIR)/$(prefix)/lib/pkgconfig/libpj-sfl.pc
@rem set MWSym2Libraries=1
@rem set EPOCROOT=\Symbian\9.1\S60_3rd\
@rem set EPOCROOT=\Symbian\9.1\S60_3rd_MR_2\
@rem set EPOCROOT=\Symbian\UIQ3SDK\
@rem set EPOCROOT=\symbian\UIQ3.1\
bldmake bldfiles
/* $Id$ */
/*
* Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "test.h"
#include <pj/string.h>
#if defined(PJ_SUNOS) && PJ_SUNOS!=0
#include <signal.h>
static void init_signals()
{
struct sigaction act;
memset(&act, 0, sizeof(act));
act.sa_handler = SIG_IGN;
sigaction(SIGALRM, &act, NULL);
}
#else