kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove libresample from the Asterisk source tree. It is now available in its

Browse Source 
own repository, and must be installed like any other library for Asterisk to
use.  The two modules that require it are codec_resample and app_jack.

To install libresample:

$ svn co http://svn.digium.com/svn/libresample/trunk libresample
$ cd libresample
$ ./configure
$ make
$ sudo make install

This code is currently in our own repository because the build system did not
include the appropriate targets for building a dynamic library or for installing
the library.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@132390 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-07-21 14:47:41 +00:00
parent 5de127e103
commit c87f901cfd
30 changed files with 331 additions and 10276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

311
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 127767 .
# From configure.ac Revision: 130040 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
#
@@ -852,6 +852,10 @@ PRI_LIB
PRI_INCLUDE
PRI_DIR
PBX_PRI
RESAMPLE_LIB
RESAMPLE_INCLUDE
RESAMPLE_DIR
PBX_RESAMPLE
SPANDSP_LIB
SPANDSP_INCLUDE
SPANDSP_DIR
@@ -1613,6 +1617,7 @@ Optional Packages:
--with-popt=PATH use popt files in PATH
--with-portaudio=PATH use PortAudio files in PATH
--with-pri=PATH use ISDN PRI files in PATH
--with-resample=PATH use LIBRESAMPLE files in PATH
--with-spandsp=PATH use SPANDSP files in PATH
--with-ss7=PATH use ISDN SS7 files in PATH
--with-pwlib=PATH use PWlib files in PATH
@@ -8817,6 +8822,34 @@ fi
RESAMPLE_DESCRIP="LIBRESAMPLE"
RESAMPLE_OPTION="resample"
# Check whether --with-resample was given.
if test "${with_resample+set}" = set; then
withval=$with_resample;
case ${withval} in
n|no)
USE_RESAMPLE=no
;;
y|ye|yes)
ac_mandatory_list="${ac_mandatory_list} RESAMPLE"
;;
*)
RESAMPLE_DIR="${withval}"
ac_mandatory_list="${ac_mandatory_list} RESAMPLE"
;;
esac
fi
PBX_RESAMPLE=0
SPANDSP_DESCRIP="SPANDSP"
SPANDSP_OPTION="spandsp"
@@ -39293,6 +39326,268 @@ fi
if test "x${PBX_RESAMPLE}" != "x1" -a "${USE_RESAMPLE}" != "no"; then
pbxlibdir=""
# if --with-RESAMPLE=DIR has been specified, use it.
if test "x${RESAMPLE_DIR}" != "x"; then
if test -d ${RESAMPLE_DIR}/lib; then
pbxlibdir="-L${RESAMPLE_DIR}/lib"
else
pbxlibdir="-L${RESAMPLE_DIR}"
fi
fi
pbxfuncname="resample_open"
if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
AST_RESAMPLE_FOUND=yes
else
as_ac_Lib=`echo "ac_cv_lib_resample_${pbxfuncname}" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lresample" >&5
echo $ECHO_N "checking for ${pbxfuncname} in -lresample... $ECHO_C" >&6; }
if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lresample ${pbxlibdir} -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* 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
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
eval "$as_ac_Lib=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Lib=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
ac_res=`eval echo '${'$as_ac_Lib'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
AST_RESAMPLE_FOUND=yes
else
AST_RESAMPLE_FOUND=no
fi
fi
# now check for the header.
if test "${AST_RESAMPLE_FOUND}" = "yes"; then
RESAMPLE_LIB="${pbxlibdir} -lresample -lm"
# if --with-RESAMPLE=DIR has been specified, use it.
if test "x${RESAMPLE_DIR}" != "x"; then
RESAMPLE_INCLUDE="-I${RESAMPLE_DIR}/include"
fi
RESAMPLE_INCLUDE="${RESAMPLE_INCLUDE} "
if test "xlibresample.h" = "x" ; then # no header, assume found
RESAMPLE_HEADER_FOUND="1"
else # check for the header
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${RESAMPLE_INCLUDE}"
if test "${ac_cv_header_libresample_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for libresample.h" >&5
echo $ECHO_N "checking for libresample.h... $ECHO_C" >&6; }
if test "${ac_cv_header_libresample_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_libresample_h" >&5
echo "${ECHO_T}$ac_cv_header_libresample_h" >&6; }
else
# Is the header compilable?
{ echo "$as_me:$LINENO: checking libresample.h usability" >&5
echo $ECHO_N "checking libresample.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <libresample.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
{ echo "$as_me:$LINENO: checking libresample.h presence" >&5
echo $ECHO_N "checking libresample.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <libresample.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ echo "$as_me:$LINENO: WARNING: libresample.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: libresample.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: libresample.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: libresample.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: libresample.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: libresample.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: libresample.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: libresample.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: libresample.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: libresample.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: libresample.h: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: libresample.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: libresample.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: libresample.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libresample.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libresample.h: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ------------------------------- ##
## Report this to www.asterisk.org ##
## ------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for libresample.h" >&5
echo $ECHO_N "checking for libresample.h... $ECHO_C" >&6; }
if test "${ac_cv_header_libresample_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_libresample_h=$ac_header_preproc
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_libresample_h" >&5
echo "${ECHO_T}$ac_cv_header_libresample_h" >&6; }
fi
if test $ac_cv_header_libresample_h = yes; then
RESAMPLE_HEADER_FOUND=1
else
RESAMPLE_HEADER_FOUND=0
fi
CPPFLAGS="${saved_cppflags}"
fi
if test "x${RESAMPLE_HEADER_FOUND}" = "x0" ; then
RESAMPLE_LIB=""
RESAMPLE_INCLUDE=""
else
if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
RESAMPLE_LIB=""
fi
PBX_RESAMPLE=1
# XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
cat >>confdefs.h <<_ACEOF
#define HAVE_RESAMPLE 1
_ACEOF
cat >>confdefs.h <<_ACEOF
#define HAVE_RESAMPLE_VERSION
_ACEOF
fi
fi
fi
if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then
{ echo "$as_me:$LINENO: checking if \"
#if SPANDSP_RELEASE_DATE < 20080516
@@ -50165,6 +50460,10 @@ PRI_LIB!$PRI_LIB$ac_delim
PRI_INCLUDE!$PRI_INCLUDE$ac_delim
PRI_DIR!$PRI_DIR$ac_delim
PBX_PRI!$PBX_PRI$ac_delim
RESAMPLE_LIB!$RESAMPLE_LIB$ac_delim
RESAMPLE_INCLUDE!$RESAMPLE_INCLUDE$ac_delim
RESAMPLE_DIR!$RESAMPLE_DIR$ac_delim
PBX_RESAMPLE!$PBX_RESAMPLE$ac_delim
SPANDSP_LIB!$SPANDSP_LIB$ac_delim
SPANDSP_INCLUDE!$SPANDSP_INCLUDE$ac_delim
SPANDSP_DIR!$SPANDSP_DIR$ac_delim
@@ -50219,10 +50518,6 @@ SUPPSERV_DIR!$SUPPSERV_DIR$ac_delim
PBX_SUPPSERV!$PBX_SUPPSERV$ac_delim
OPENSSL_LIB!$OPENSSL_LIB$ac_delim
OPENSSL_INCLUDE!$OPENSSL_INCLUDE$ac_delim
OPENSSL_DIR!$OPENSSL_DIR$ac_delim
PBX_OPENSSL!$PBX_OPENSSL$ac_delim
FREETDS_LIB!$FREETDS_LIB$ac_delim
FREETDS_INCLUDE!$FREETDS_INCLUDE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -50264,6 +50559,10 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
OPENSSL_DIR!$OPENSSL_DIR$ac_delim
PBX_OPENSSL!$PBX_OPENSSL$ac_delim
FREETDS_LIB!$FREETDS_LIB$ac_delim
FREETDS_INCLUDE!$FREETDS_INCLUDE$ac_delim
FREETDS_DIR!$FREETDS_DIR$ac_delim
PBX_FREETDS!$PBX_FREETDS$ac_delim
TERMCAP_LIB!$TERMCAP_LIB$ac_delim
@@ -50340,7 +50639,7 @@ CURL_CONFIG!$CURL_CONFIG$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5