Add configuration support for half_full DAHDI buffer policy
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@166058 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
mattf
parent
9e50348326
commit
e679eac279
|
|
@ -13890,6 +13890,10 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
|
|||
confp->chan.buf_policy = DAHDI_POLICY_WHEN_FULL;
|
||||
} else if (!strcasecmp(policy, "immediate")) {
|
||||
confp->chan.buf_policy = DAHDI_POLICY_IMMEDIATE;
|
||||
#ifdef HAVE_DAHDI_HALF_FULL
|
||||
} else if (!strcasecmp(policy, "half_full")) {
|
||||
confp->chan.buf_policy = DAHDI_POLICY_HALF_FULL;
|
||||
#endif
|
||||
} else {
|
||||
ast_log(LOG_WARNING, "Invalid policy name given (%s).\n", policy);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.ac Revision: 163168 .
|
||||
# From configure.ac Revision: 164802 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
|
||||
#
|
||||
|
|
@ -984,6 +984,7 @@ AST_NO_STRICT_OVERFLOW
|
|||
AST_SHADOW_WARNINGS
|
||||
PBX_RTLD_NOLOAD
|
||||
PBX_IP_MTU_DISCOVER
|
||||
PBX_DAHDI_HALF_FULL
|
||||
GSM_INTERNAL
|
||||
CONFIG_LIBXML2
|
||||
PBX_MISDN_FAC_RESULT
|
||||
|
|
@ -15675,7 +15676,9 @@ done
|
|||
|
||||
|
||||
|
||||
for ac_func in asprintf atexit dup2 endpwent ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday ioperm inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtol strtoq sysctl swapctl unsetenv utime vasprintf getpeereid
|
||||
|
||||
|
||||
for ac_func in asprintf atexit dup2 endpwent ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday ioperm inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtol strtoq unsetenv utime vasprintf getpeereid sysctl swapctl
|
||||
do
|
||||
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
|
||||
|
|
@ -20317,6 +20320,83 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|||
|
||||
|
||||
|
||||
|
||||
if test "x${PBX_DAHDI_HALF_FULL}" != "x1"; then
|
||||
{ echo "$as_me:$LINENO: checking for DAHDI_POLICY_HALF_FULL in dahdi/user.h" >&5
|
||||
echo $ECHO_N "checking for DAHDI_POLICY_HALF_FULL in dahdi/user.h... $ECHO_C" >&6; }
|
||||
saved_cppflags="${CPPFLAGS}"
|
||||
if test "x${DAHDI_HALF_FULL_DIR}" != "x"; then
|
||||
DAHDI_HALF_FULL_INCLUDE="-I${DAHDI_HALF_FULL_DIR}/include"
|
||||
fi
|
||||
CPPFLAGS="${CPPFLAGS} ${DAHDI_HALF_FULL_INCLUDE}"
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <dahdi/user.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
#if defined(DAHDI_POLICY_HALF_FULL)
|
||||
int foo = 0;
|
||||
#else
|
||||
int foo = bar;
|
||||
#endif
|
||||
0
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_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
|
||||
{ echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6; }
|
||||
PBX_DAHDI_HALF_FULL=1
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_DAHDI_HALF_FULL 1
|
||||
_ACEOF
|
||||
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_DAHDI_HALF_FULL_VERSION
|
||||
_ACEOF
|
||||
|
||||
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
CPPFLAGS="${saved_cppflags}"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# BSD might not have exp2, and/or log2
|
||||
|
||||
if test "x${PBX_EXP2L}" != "x1" -a "${USE_EXP2L}" != "no"; then
|
||||
|
|
@ -53555,6 +53635,7 @@ AST_NO_STRICT_OVERFLOW!$AST_NO_STRICT_OVERFLOW$ac_delim
|
|||
AST_SHADOW_WARNINGS!$AST_SHADOW_WARNINGS$ac_delim
|
||||
PBX_RTLD_NOLOAD!$PBX_RTLD_NOLOAD$ac_delim
|
||||
PBX_IP_MTU_DISCOVER!$PBX_IP_MTU_DISCOVER$ac_delim
|
||||
PBX_DAHDI_HALF_FULL!$PBX_DAHDI_HALF_FULL$ac_delim
|
||||
GSM_INTERNAL!$GSM_INTERNAL$ac_delim
|
||||
CONFIG_LIBXML2!$CONFIG_LIBXML2$ac_delim
|
||||
PBX_MISDN_FAC_RESULT!$PBX_MISDN_FAC_RESULT$ac_delim
|
||||
|
|
@ -53577,7 +53658,6 @@ AIS_INCLUDE!$AIS_INCLUDE$ac_delim
|
|||
AIS_LIB!$AIS_LIB$ac_delim
|
||||
CONFIG_GMIME!$CONFIG_GMIME$ac_delim
|
||||
EDITLINE_LIB!$EDITLINE_LIB$ac_delim
|
||||
PBX_H323!$PBX_H323$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
|
|
@ -53619,6 +53699,7 @@ _ACEOF
|
|||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
PBX_H323!$PBX_H323$ac_delim
|
||||
PBX_IXJUSER!$PBX_IXJUSER$ac_delim
|
||||
CONFIG_SDL!$CONFIG_SDL$ac_delim
|
||||
CONFIG_GTK!$CONFIG_GTK$ac_delim
|
||||
|
|
@ -53627,7 +53708,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` = 6; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
|
|
|||
|
|
@ -615,6 +615,8 @@ fi
|
|||
|
||||
AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h])
|
||||
|
||||
AST_C_DEFINE_CHECK([DAHDI_HALF_FULL], [DAHDI_POLICY_HALF_FULL], [dahdi/user.h])
|
||||
|
||||
# BSD might not have exp2, and/or log2
|
||||
AST_EXT_LIB_CHECK([EXP2L], [m], [exp2l])
|
||||
AST_EXT_LIB_CHECK([LOG2L], [m], [log2l])
|
||||
|
|
|
|||
|
|
@ -183,6 +183,12 @@
|
|||
/* Define if your system has the DAHDI headers. */
|
||||
#undef HAVE_DAHDI
|
||||
|
||||
/* Define if your system has the DAHDI_HALF_FULL headers. */
|
||||
#undef HAVE_DAHDI_HALF_FULL
|
||||
|
||||
/* Define DAHDI_HALF_FULL headers version */
|
||||
#undef HAVE_DAHDI_HALF_FULL_VERSION
|
||||
|
||||
/* Define DAHDI headers version */
|
||||
#undef HAVE_DAHDI_VERSION
|
||||
|
||||
|
|
|
|||
Reference in New Issue