summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorKevin Harwell <kharwell@digium.com>2016-09-29 14:02:37 -0500
committerKevin Harwell <kharwell@digium.com>2016-09-29 14:31:43 -0500
commit65d0cbea1bc9ed48978e7e40be80cd2ed4aae3ef (patch)
treed0aa53b86e7eb185ea9123e3c4431a6f23b51731 /configure
parent013414ca4b32fa4f25ec37076b537d0bb130be9f (diff)
Remove "format_ogg_opus: New format"
This reverts commit 40aa28131bc30b4516da2b20eb1a1e043920169c. ASTERISK-26426 #close Change-Id: I81e55c3c512f1dd6f49896f0c6b97a07d74fd8f5
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure148
1 files changed, 0 insertions, 148 deletions
diff --git a/configure b/configure
index ceb261faa..c9cd624ba 100755
--- a/configure
+++ b/configure
@@ -994,10 +994,6 @@ PBX_OSPTK
OSPTK_DIR
OSPTK_INCLUDE
OSPTK_LIB
-PBX_OPUSFILE
-OPUSFILE_DIR
-OPUSFILE_INCLUDE
-OPUSFILE_LIB
PBX_OPUS
OPUS_DIR
OPUS_INCLUDE
@@ -1397,7 +1393,6 @@ with_newt
with_ogg
with_openr2
with_opus
-with_opusfile
with_osptk
with_oss
with_postgres
@@ -2155,7 +2150,6 @@ Optional Packages:
--with-ogg=PATH use OGG files in PATH
--with-openr2=PATH use MFR2 files in PATH
--with-opus=PATH use Opus files in PATH
- --with-opusfile=PATH use Opusfile files in PATH
--with-osptk=PATH use OSP Toolkit files in PATH
--with-oss=PATH use Open Sound System files in PATH
--with-postgres=PATH use PostgreSQL files in PATH
@@ -10810,38 +10804,6 @@ fi
- OPUSFILE_DESCRIP="Opusfile"
- OPUSFILE_OPTION="opusfile"
- PBX_OPUSFILE=0
-
-# Check whether --with-opusfile was given.
-if test "${with_opusfile+set}" = set; then :
- withval=$with_opusfile;
- case ${withval} in
- n|no)
- USE_OPUSFILE=no
- # -1 is a magic value used by menuselect to know that the package
- # was disabled, other than 'not found'
- PBX_OPUSFILE=-1
- ;;
- y|ye|yes)
- ac_mandatory_list="${ac_mandatory_list} OPUSFILE"
- ;;
- *)
- OPUSFILE_DIR="${withval}"
- ac_mandatory_list="${ac_mandatory_list} OPUSFILE"
- ;;
- esac
-
-fi
-
-
-
-
-
-
-
-
OSPTK_DESCRIP="OSP Toolkit"
OSPTK_OPTION="osptk"
PBX_OSPTK=0
@@ -29512,116 +29474,6 @@ _ACEOF
fi
-# opusfile.h includes <opus_multistream.h> so we need to make sure that
-# either $OPUS_INCLUDE or /usr/include/opus is added to the search path.
-__opus_include=${OPUS_INCLUDE}
-if test -z "$__opus_include" -o x"$__opus_include" = x" " ; then
- __opus_include=-I/usr/include/opus
-fi
-
-if test "x${PBX_OPUSFILE}" != "x1" -a "${USE_OPUSFILE}" != "no"; then
- pbxlibdir=""
- # if --with-OPUSFILE=DIR has been specified, use it.
- if test "x${OPUSFILE_DIR}" != "x"; then
- if test -d ${OPUSFILE_DIR}/lib; then
- pbxlibdir="-L${OPUSFILE_DIR}/lib"
- else
- pbxlibdir="-L${OPUSFILE_DIR}"
- fi
- fi
- pbxfuncname="op_open_callbacks"
- if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_OPUSFILE_FOUND=yes
- else
- ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} $__opus_include"
- as_ac_Lib=`$as_echo "ac_cv_lib_opusfile_${pbxfuncname}" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lopusfile" >&5
-$as_echo_n "checking for ${pbxfuncname} in -lopusfile... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lopusfile ${pbxlibdir} $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ${pbxfuncname} ();
-int
-main ()
-{
-return ${pbxfuncname} ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
-else
- eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
- AST_OPUSFILE_FOUND=yes
-else
- AST_OPUSFILE_FOUND=no
-fi
-
- CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
- fi
-
- # now check for the header.
- if test "${AST_OPUSFILE_FOUND}" = "yes"; then
- OPUSFILE_LIB="${pbxlibdir} -lopusfile "
- # if --with-OPUSFILE=DIR has been specified, use it.
- if test "x${OPUSFILE_DIR}" != "x"; then
- OPUSFILE_INCLUDE="-I${OPUSFILE_DIR}/include"
- fi
- OPUSFILE_INCLUDE="${OPUSFILE_INCLUDE} $__opus_include"
- if test "xopus/opusfile.h" = "x" ; then # no header, assume found
- OPUSFILE_HEADER_FOUND="1"
- else # check for the header
- ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${OPUSFILE_INCLUDE}"
- ac_fn_c_check_header_mongrel "$LINENO" "opus/opusfile.h" "ac_cv_header_opus_opusfile_h" "$ac_includes_default"
-if test "x$ac_cv_header_opus_opusfile_h" = xyes; then :
- OPUSFILE_HEADER_FOUND=1
-else
- OPUSFILE_HEADER_FOUND=0
-fi
-
-
- CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
- fi
- if test "x${OPUSFILE_HEADER_FOUND}" = "x0" ; then
- OPUSFILE_LIB=""
- OPUSFILE_INCLUDE=""
- else
- if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- OPUSFILE_LIB=""
- fi
- PBX_OPUSFILE=1
- cat >>confdefs.h <<_ACEOF
-#define HAVE_OPUSFILE 1
-_ACEOF
-
- fi
- fi
-fi
-
-
if test "${USE_PWLIB}" != "no"; then
if test -n "${PWLIB_DIR}"; then