mirror of
https://git.jami.net/savoirfairelinux/jami-daemon.git
synced 2025-08-07 22:02:12 +08:00
Remove exosip stuff, correct warnings in sipcall
This commit is contained in:
30
configure.ac
30
configure.ac
@ -126,9 +126,7 @@ AC_CHECK_FUNCS([bzero floor gethostbyname gethrtime gettimeofday \
|
||||
inet_ntoa memset mkdir pathconf pow regcomp select setlocale socket \
|
||||
strchr strdup strerror strrchr strstr strtol utime])
|
||||
|
||||
dnl Check for exosip2
|
||||
LP_CHECK_EXOSIP2
|
||||
SFLPHONE_LIBS="$SFLPHONE_LIBS $EXOSIP_LIBS"
|
||||
SFLPHONE_LIBS="$SFLPHONE_LIBS"
|
||||
|
||||
dnl Check for GNU ccRTP
|
||||
PKG_PROG_PKG_CONFIG
|
||||
@ -139,12 +137,6 @@ if test "x${have_libpj}" = "xfalse" ; then
|
||||
AC_MSG_ERROR([PJSIP not found. http://www.pjsip.org/download.htm])
|
||||
fi
|
||||
|
||||
LIBOSIP2_OSIPLISTNOPOINTER_MIN_VERSION=3.0.0
|
||||
PKG_CHECK_MODULES([libosip2], [libosip2 >= ${LIBOSIP2_OSIPLISTNOPOINTER_MIN_VERSION}],
|
||||
[LIBOSIP2_CFLAGS=""], [LIBOSIP2_CFLAGS="-DLIBOSIP2_WITHPOINTER"])
|
||||
SIP_CFLAGS="$SIP_CFLAGS $LIBOSIP2_CFLAGS";
|
||||
AC_SUBST(SIP_CFLAGS)
|
||||
|
||||
LIBASOUND2_MIN_VERSION=1.0
|
||||
PKG_CHECK_MODULES(alsa, alsa >= ${LIBASOUND2_MIN_VERSION})
|
||||
SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $libasound2_CFLAGS"
|
||||
@ -349,26 +341,6 @@ DBUS_SERVICES_DIR="$datadir/dbus-1/services"
|
||||
AC_SUBST(DBUS_SERVICES_DIR)
|
||||
AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is])
|
||||
|
||||
|
||||
dnl QT interface
|
||||
AC_MSG_CHECKING([whether to enable sflphoneqt])
|
||||
AC_ARG_ENABLE(sflphoneqt,
|
||||
AS_HELP_STRING(
|
||||
[--enable-sflphoneqt],
|
||||
[enable sflphone-qt compilation @<:@default=no@:>@]
|
||||
),
|
||||
[with_sflphoneqt=$enableval],
|
||||
[with_sflphoneqt=no]
|
||||
)
|
||||
AM_CONDITIONAL(WITH_QT, test "x$with_sflphoneqt" = "xyes")
|
||||
AM_CONDITIONAL(include_x11, test x$with_sflphoneqt = "xyes")
|
||||
if test "x$with_sflphoneqt" = "xno"; then
|
||||
AC_MSG_RESULT(no)
|
||||
else
|
||||
AC_MSG_RESULT(yes)
|
||||
gw_CHECK_QT
|
||||
fi
|
||||
|
||||
# Go!
|
||||
AC_SUBST(SFLPHONE_CFLAGS)
|
||||
AC_SUBST(SFLPHONE_LIBS)
|
||||
|
Reference in New Issue
Block a user