diff --git a/daemon/configure.ac b/daemon/configure.ac index 2dd38575ed4151aec9afeda1b2094f1684812ac9..de3bf82e8670c12ec79f27c1dc04fdfa76ade7b3 100644 --- a/daemon/configure.ac +++ b/daemon/configure.ac @@ -525,15 +525,6 @@ AS_IF([test "x$enable_dht" != "xno" -a "$HAVE_GNUTLS" -eq 1], [AC_DEFINE([HAVE_DHT], 0, [Define to enable dht]) AM_CONDITIONAL(USE_DHT, false)]) -# NETWORK MANAGER -# required dependency(ies): libiax2 (static) -dnl Check for network-manager -AC_ARG_WITH([networkmanager], [AS_HELP_STRING([--without-networkmanager], - [disable support for network-manager events])], [], - [with_networkmanager=yes]) - -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])) diff --git a/daemon/src/Makefile.am b/daemon/src/Makefile.am index cb9a23f615b120ca971f3d9dda4097fc643b4617..1a7b319c3e0842d8fbe7f16564fed7852cafb9ed 100644 --- a/daemon/src/Makefile.am +++ b/daemon/src/Makefile.am @@ -30,10 +30,6 @@ RINGACC_CXXFLAG=-DUSE_DHT RINGACC_LIBA=./ringdht/libringacc.la endif -if USE_NETWORKMANAGER -NETWORKMANAGER=-DUSE_NETWORKMANAGER -endif - if BUILD_TLS TLS_LIB = @GNUTLS_LIBS@ TLS_CFLAGS = @GNUTLS_CFLAGS@ diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp index 585710053279a11128d0ae98b464a8ffa2495504..0894b31010e297c7fcb438cfb481f23bc48147d9 100644 --- a/daemon/src/managerimpl.cpp +++ b/daemon/src/managerimpl.cpp @@ -164,9 +164,6 @@ ManagerImpl::ManagerImpl() : presenceManager_(new PresenceManager) #ifdef RING_VIDEO , videoManager_(new VideoManager) -#endif -#ifdef USE_NETWORKMANAGER - , networkManager_(0) #endif , currentCallMutex_(), dtmfKey_(), dtmfBuf_(0, AudioFormat::MONO()), toneMutex_(), telephoneTone_(), audiofile_(), audioLayerMutex_(),