Commit eae6e24b authored by Tristan Matthews's avatar Tristan Matthews

* #9730: builds against libccrtp1

parent 6951cd41
......@@ -119,10 +119,15 @@ LIBSAMPLERATE_MIN_VERSION=0.1.2
PKG_CHECK_MODULES(SAMPLERATE, samplerate >= ${LIBSAMPLERATE_MIN_VERSION},, AC_MSG_ERROR([Missing libsamplerate development package: libsamplerate0-dev]))
LIBCCGNU2_MIN_VERSION=1.3.1
PKG_CHECK_MODULES(CCGNU2, commoncpp >= ${LIBCCGNU2_MIN_VERSION},, AC_MSG_ERROR([Missing common cpp development package: libcommoncpp2-dev]))
PKG_CHECK_MODULES([CCGNU2], [commoncpp] >= ${LIBCCGNU2_MIN_VERSION}, AC_DEFINE_UNQUOTED([COMMONCPP_PREFIX], [1], [Use commoncpp include prefix]), [
PKG_CHECK_MODULES([CCGNU2], [libccgnu2] >= ${LIBCCGNU2_MIN_VERSION}, AC_DEFINE_UNQUOTED([CCPP_PREFIX], [1], [Use cc++ include prefix]),
AC_MSG_ERROR([Missing common cpp development package: libcommoncpp2-dev]))
])
LIBCCRT_MIN_VERSION=1.3.0
PKG_CHECK_MODULES(CCRTP, libccrtp >= ${LIBCCRT_MIN_VERSION},, AC_MSG_ERROR([Missing ccrtp development package: libccrtp-dev]))
LIBCCRTP_MIN_VERSION=1.3.0
PKG_CHECK_MODULES([CCRTP], [libccrtp] >= ${LIBCCRTP_MIN_VERSION},, [
PKG_CHECK_MODULES([CCRTP], [libccrtp1] >= ${LIBCCRTP_MIN_VERSION},, AC_MSG_ERROR([Missing ccrtp development package: libccrtp-dev]))
])
dnl Check for OpenSSL to link against pjsip and provide SIPS TLS support
PKG_CHECK_MODULES([libssl], libssl,, AC_MSG_ERROR([Missing ssl development package: libssl-dev]))
......
......@@ -48,7 +48,8 @@ noinst_HEADERS = \
logger.h \
numbercleaner.h \
fileutils.h \
noncopyable.h
noncopyable.h \
cc_thread.h
libsflphone_la_LIBADD = \
$(top_builddir)/libs/iax2/libiax2.la \
......
......@@ -34,7 +34,7 @@
#ifndef __AUDIO_LAYER_H__
#define __AUDIO_LAYER_H__
#include <commoncpp/thread.h> // for ost::Mutex
#include "cc_thread.h" // for ost::Mutex
#include <sys/time.h>
#include "ringbuffer.h"
......
......@@ -28,11 +28,11 @@
* as that of the covered work.
*/
#ifndef __AUDIORECORDER_H_
#define __AUDIORECORDER_H_
#ifndef AUDIORECORDER_H_
#define AUDIORECORDER_H_
#include <string>
#include <commoncpp/thread.h>
#include "cc_thread.h"
#include "audiorecord.h"
#include "noncopyable.h"
......
......@@ -32,8 +32,8 @@
#define __AUDIO_RTP_FACTORY_H__
#include <stdexcept>
#include <commoncpp/thread.h>
#include <ccrtp/CryptoContext.h>
#include "cc_thread.h"
#include "audio_rtp_session.h"
#include "noncopyable.h"
......
......@@ -34,9 +34,9 @@
#include <map>
#include <set>
#include <commoncpp/thread.h> // for ost::Mutex
#include <string>
#include "cc_thread.h" // for ost::Mutex
#include "global.h"
#include "call.h"
#include "ringbuffer.h"
......
......@@ -32,9 +32,8 @@
#ifndef CALL_H
#define CALL_H
#include <commoncpp/thread.h> // for mutex
#include <sstream>
#include "cc_thread.h"
#include "audio/recordable.h"
/*
......
/*
* Copyright (C) 2012 Savoir-Faire Linux Inc.
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* 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 3 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., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#ifndef CC_CONFIG_H_
#define CC_CONFIG_H_
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef CCPP_PREFIX
#include <cc++/config.h>
#else
#include <commoncpp/config.h>
#endif
#endif // CC_CONFIG_H_
/*
* Copyright (C) 2012 Savoir-Faire Linux Inc.
* Author: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
*
* 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 3 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., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#ifndef CC_THREAD_H_
#define CC_THREAD_H_
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef CCPP_PREFIX
#include <cc++/thread.h> // for mutex
#else
#include <commoncpp/thread.h> // for mutex
#endif
#endif // CC_THREAD_H_
......@@ -27,10 +27,10 @@
* as that of the covered work.
*/
#ifndef __SFL_CODEC_H__
#define __SFL_CODEC_H__
#ifndef CODEC_H_
#define CODEC_H_
#include <commoncpp/config.h> // for types
#include "cc_config.h" // for types
/**
* Interface for both audio codecs as well as video codecs.
......@@ -65,4 +65,4 @@ typedef sfl::Codec* create_t();
typedef void destroy_t (sfl::Codec*);
#endif
#endif // CODEC_H_
......@@ -29,6 +29,7 @@ libdbus_la_CXXFLAGS = \
-DPROGSHAREDIR=\"${datadir}/sflphone\" \
$(NETWORKMANAGER)
noinst_HEADERS = \
callmanager.h \
configurationmanager.h \
......
......@@ -31,7 +31,7 @@
#ifndef EVENT_THREAD_H_
#define EVENT_THREAD_H_
#include <commoncpp/thread.h>
#include "cc_thread.h"
#include "noncopyable.h"
class VoIPLink;
......
......@@ -39,8 +39,8 @@
#include <vector>
#include <set>
#include <map>
#include <commoncpp/thread.h>
#include <memory>
#include "cc_thread.h"
#include "dbus/dbusmanager.h"
#include "config/config.h"
......
......@@ -45,6 +45,7 @@
#include <sys/ioctl.h>
#include <unistd.h>
#include <arpa/inet.h>
#include <net/if.h>
#include "siptransport.h"
#include "manager.h"
......
......@@ -36,7 +36,7 @@
#include <stdexcept>
#include <map>
#include <commoncpp/thread.h> // for ost::Mutex
#include "cc_thread.h" // for ost::Mutex
class Call;
class Account;
......
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