jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into m_savard

Browse Source
This commit is contained in:
Alexandre Savard
2009-05-07 16:02:07 -04:00
parent 7d0807dbdc 22d0135a84
commit 0a97ce8e7f
2 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sflphone-common/configure.ac
View File

@ -6,20 +6,23 @@ AC_INIT([SFLphone],[0.9.5~beta],[sflphoneteam@savoirfairelinux.com],[sflphone])
AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
AC_REVISION([$Revision$])
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER([config.h])
dnl Compute canonical system name
dnl AC_CANONICAL_TARGET
dnl Use this variable in the program
AC_SUBST(PACKAGE_VERSION)
AM_PROG_LIBTOOL
dnl Rewrite name of programs to be installed
dnl AC_ARG_PROGRAM
dnl Compute canonical system name
dnl AC_CANONICAL_TARGET
dnl Improve make variable MAKE
AC_PROG_MAKE_SET
@ -144,11 +147,11 @@ dnl Check for GNU ccRTP
PKG_PROG_PKG_CONFIG
#Trying to set PJSIP using pkg-config
PKG_CHECK_MODULES(SIP, libpj-sfl, have_libpj=true, have_libpj=false)
if test "x${have_libpj}" = "xfalse" ; then
AC_MSG_ERROR([PJSIP not found. http://www.pjsip.org/download.htm])
fi
AC_SUBST(SIP_CFLAGS)
#PKG_CHECK_MODULES(SIP, libpj-sfl, have_libpj=true, have_libpj=false)
#if test "x${have_libpj}" = "xfalse" ; then
# AC_MSG_ERROR([PJSIP not found. http://www.pjsip.org/download.htm])
#fi
#AC_SUBST(SIP_CFLAGS)
dnl Check for uuid development package - name: uuid-dev
UUID_MIN_VERSION=1.0
@ -393,4 +396,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! Run `make' to build the software.]])
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.]])

20
sflphone-common/globals.mak
View File

@ -3,7 +3,22 @@ src=$(top_srcdir)
sflcodecdir=$(libdir)/sflphone/codecs
sflplugindir=$(libdir)/sflphone/plugins
PJSIP_LIBS = -lpjnath-sfl -lpjsua-sfl -lpjsip-sfl -lpjmedia-sfl -lpjsip-simple-sfl -lpjsip-ua-sfl -lpjmedia-codec-sfl -lpjlib-util-sfl -lpj-sfl
# for pjsip
export TARGET_NAME := @target@
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 \
-lpjnath-sfl-$(TARGET_NAME) -lpjsua-sfl-$(TARGET_NAME) -lpjsip-sfl-$(TARGET_NAME) -lpjmedia-sfl-$(TARGET_NAME) -lpjsip-simple-sfl-$(TARGET_NAME) -lpjsip-ua-sfl-$(TARGET_NAME) -lpjmedia-codec-sfl-$(TARGET_NAME) -lpjlib-util-sfl-$(TARGET_NAME) -lpj-sfl-$(TARGET_NAME)
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
DBUSCPP_CFLAGS=$(top_srcdir)/libs/dbus-c++/include/dbus-c++
@ -24,13 +39,14 @@ AM_CPPFLAGS = \
-I$(src)/libs \
-I$(src)/libs/dbus-c++/include \
-I$(src)/libs/iax2 \
-I$(src)/libs/pjproject-1.0.1 \
-I$(src)/src \
-I$(src)/test \
-DPREFIX=\"$(prefix)\" \
-DPROGSHAREDIR=\"${datadir}/sflphone\" \
$(ZEROCONFFLAGS) \
$(IAX_FLAGS) \
@SIP_CFLAGS@ \
$(SIP_CFLAGS) \
$(DBUSCPP_CFLAGS) \
-DCODECS_DIR=\""$(sflcodecdir)"\" \
-DPLUGINS_DIR=\""$(sflplugindir)"\" \