From dd229492ad5fad005fe60eaf3cdb12b267e3dd15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Tue, 15 Apr 2014 16:37:06 -0400 Subject: [PATCH] second attempt to fix the build --- daemon/configure.ac | 8 +++++++- daemon/src/audio/audiortp/audio_rtp_factory.cpp | 2 +- daemon/src/audio/audiortp/audio_symmetric_rtp_session.cpp | 4 ++-- daemon/src/audio/audiortp/audio_symmetric_rtp_session.h | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/daemon/configure.ac b/daemon/configure.ac index b617268a2a..f2a1968bbf 100644 --- a/daemon/configure.ac +++ b/daemon/configure.ac @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.65]) AC_INIT([sflphone],[1.3.0],[sflphoneteam@savoirfairelinux.com],[sflphone]) -AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013]]) +AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014]]) AC_REVISION([$Revision$]) AC_CONFIG_AUX_DIR([build-aux]) @@ -364,6 +364,12 @@ AC_ARG_WITH([networkmanager], [AS_HELP_STRING([--without-networkmanager], AM_CONDITIONAL(USE_NETWORKMANAGER, test "x$with_networkmanager" = "xyes" ) +dnl IPv6 mode is default-disabled +AC_ARG_ENABLE([ipv6], AS_HELP_STRING([--enable-ipv6], [Enable IPv6 support])) + +AC_DEFINE_UNQUOTED([HAVE_IPV6], `if test "x$with_ipv6" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have IPv6]) +AM_CONDITIONAL(BUILD_IPV6, test "x$with_ipv6" = "xyes" ) + # DOXYGEN # required dependency(ies): doxygen diff --git a/daemon/src/audio/audiortp/audio_rtp_factory.cpp b/daemon/src/audio/audiortp/audio_rtp_factory.cpp index 1b78cbaec5..9d372d213c 100644 --- a/daemon/src/audio/audiortp/audio_rtp_factory.cpp +++ b/daemon/src/audio/audiortp/audio_rtp_factory.cpp @@ -123,7 +123,7 @@ void AudioRtpFactory::initSession() throw UnsupportedRtpSessionType("Unsupported Rtp Session Exception Type!"); } } else { -#ifdef CCXX_IPV6 +#if HAVE_IPV6 /*if (call_->isIPv6()) { rtpSession_.reset(new AudioSymmetricRtpSessionIPv6(*call_)); } else */ diff --git a/daemon/src/audio/audiortp/audio_symmetric_rtp_session.cpp b/daemon/src/audio/audiortp/audio_symmetric_rtp_session.cpp index e6bdc7ce9f..b97742b212 100644 --- a/daemon/src/audio/audiortp/audio_symmetric_rtp_session.cpp +++ b/daemon/src/audio/audiortp/audio_symmetric_rtp_session.cpp @@ -155,7 +155,7 @@ void AudioSymmetricRtpSession::onGotSR(ost::SyncSource& source, ost::RTCPCompoun } } -#ifdef CCXX_IPV6 +#if HAVE_IPV6 AudioSymmetricRtpSessionIPv6::AudioSymmetricRtpSessionIPv6(SIPCall &call) : ost::SymmetricRTPSessionIPV6(ost::IPV6Host(call.getLocalIp().c_str()), call.getLocalAudioPort()) @@ -200,6 +200,6 @@ void AudioSymmetricRtpSessionIPv6::onGotSR(ost::SyncSource& source, ost::RTCPCom // TODO: do something with this data } -#endif // CCXX_IPV6 +#endif // HAVE_IPV6 } diff --git a/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h b/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h index 7b8481a46a..90bf9b7bf3 100644 --- a/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h +++ b/daemon/src/audio/audiortp/audio_symmetric_rtp_session.h @@ -77,7 +77,7 @@ class AudioSymmetricRtpSession : public ost::SymmetricRTPSession, public AudioRt void startRTPLoop(); }; -#ifdef CCXX_IPV6 +#if HAVE_IPV6 class AudioSymmetricRtpSessionIPv6 : public ost::SymmetricRTPSessionIPV6, public AudioRtpSession { public: @@ -113,7 +113,7 @@ class AudioSymmetricRtpSessionIPv6 : public ost::SymmetricRTPSessionIPV6, public void startRTPLoop(); }; -#endif // CCXX_IPV6 +#endif // HAVE_IPV6 } #pragma GCC diagnostic warning "-Weffc++" -- GitLab