Commit 2cbbaf79 authored by Philippe Gorley's avatar Philippe Gorley Committed by Adrien Béraud

configure: remove ilbc and gsm

FFmpeg's RTP muxer does not support GSM, while Ubuntu does not package
iLBC. Removes the old configure switches.

Removes package detection from contrib. Keeps contrib rules in case GSM
is later readded.

Change-Id: I705a521e2baf34c757c22a72e04cdf27233b5a7b
parent b1539bd1
......@@ -35,9 +35,6 @@ systems. This function is required for `alloca.c' support on those systems.
/* Define to 1 if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1
/* Define if you have libgsm */
#define HAVE_GSM 1
/* Define if you have libiax */
#define HAVE_IAX 0
......@@ -53,9 +50,6 @@ systems. This function is required for `alloca.c' support on those systems.
/* Define if you have jack */
#define HAVE_JACK 0
/* Define to 1 if you have the `gsm' library (-lgsm). */
#define HAVE_LIBGSM 1
/* Define to 1 if you have the <libintl.h> header file. */
#define HAVE_LIBINTL_H 0
......@@ -253,4 +247,4 @@ calls it, or to nothing if 'inline' is not supported under any name. */
/* Define to empty if the keyword `volatile' does not work. Warning: valid
code using `volatile' can become incorrect without. Disable with care. */
/* #undef volatile */
\ No newline at end of file
/* #undef volatile */
This diff is collapsed.
......@@ -541,27 +541,6 @@ CPPUNIT_MIN_VERSION=1.12
PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION}, AM_CONDITIONAL(BUILD_TEST, test 1 = 1 ), AM_CONDITIONAL(BUILD_TEST, test 0 = 1 ))
if test "${SYS}" != "mingw32"; then
# GSM CODEC
# required dependency(ies): libgsm
dnl check for libgsm1 (doesn't use pkg-config)
dnl Check for libgsm
AC_ARG_WITH([gsm], [AS_HELP_STRING([--without-gsm],
[disable support for gsm codec])], [], [with_gsm=yes])
LIBGSM=
AS_IF([test "x$with_gsm" != xno],
[AC_CHECK_HEADER([gsm/gsm.h], , AC_MSG_FAILURE([Unable to find the libgsm1 headers (you may need to install the dev package). You may use --without-gsm to compile without gsm codec support.]))]
[AC_CHECK_LIB([gsm], [gsm_decode], [], [
AC_MSG_FAILURE([libgsm link test failed. You may use --without-gsm to compile without gsm codec support.])
])
])
AC_DEFINE_UNQUOTED([HAVE_GSM], `if test "x$with_gsm" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have libgsm])
fi
AM_CONDITIONAL(BUILD_GSM, test "x$with_gsm" = "xyes" )
# SPEEX CODEC
# required dependency(ies): libspeex
dnl Check for libspeex
......@@ -590,18 +569,6 @@ AS_IF([test "x$with_speexdsp" != xno], [PKG_CHECK_MODULES([SPEEXDSP], [speexdsp]
AC_DEFINE_UNQUOTED([HAVE_SPEEXDSP], `if test "x$with_speexdsp" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have libspeexdsp])
AM_CONDITIONAL(BUILD_SPEEXDSP, test "x$with_speexdsp" = "xyes" )
dnl iLBC is enabled if it's installed
AC_ARG_WITH([libilbc],
[AS_HELP_STRING([--with-libilbc],
[support ilbc audio @<:@default=check@:>@])],
[],
[with_libilbc=check])
AS_CASE(["$with_libilbc"],
[yes], [PKG_CHECK_MODULES([libilbc], [libilbc], [HAVE_LIBILBC=1])],
[no], [HAVE_LIBILBC=0],
[PKG_CHECK_MODULES([libilbc], [libilbc], [HAVE_LIBILBC=1], [HAVE_LIBILBC=0])])
AM_CONDITIONAL([BUILD_ILBC], [test "$HAVE_LIBILBC" -eq 1])
dnl opus is enabled if it's installed
AC_ARG_WITH([opus],
[AS_HELP_STRING([--with-opus], [support opus audio @<:@default=check@:>@])], [], [with_opus=check])
......
......@@ -2,7 +2,7 @@
GSM_VERSION := 1.0.13
GSM_URL := $(CONTRIB_VIDEOLAN)/libgsm_$(GSM_VERSION).tar.gz
PKGS += gsm
#PKGS += gsm
$(TARBALLS)/libgsm_$(GSM_VERSION).tar.gz:
$(call download,$(GSM_URL))
......
......@@ -45,7 +45,6 @@ RUN apt-get update && \
libavdevice-dev \
libopus-dev \
libudev-dev \
libgsm1-dev \
libjsoncpp-dev \
libnatpmp-dev \
libappindicator3-dev \
......
......@@ -14,10 +14,6 @@ if BUILD_OPUS
OPUSCODEC=-DHAVE_OPUS
endif
if BUILD_GSM
GSMCODEC=-DHAVE_GSM_CODEC
endif
RING_DIRTY_REPO ?= $(shell git diff-index --quiet HEAD 2>/dev/null || echo dirty)
RING_REVISION ?= $(shell git log -1 --format="%h" --abbrev=10 2>/dev/null)
......@@ -37,7 +33,6 @@ AM_CPPFLAGS = \
-DPJSIP_MAX_PKT_LEN=8000 \
-DPJ_AUTOCONF=1 \
$(SPEEXCODEC) \
$(GSMCODEC) \
$(OPUSCODEC)
......
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