diff options
| -rw-r--r-- | channels/chan_dahdi.c | 12 | ||||
| -rwxr-xr-x | configure | 266 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 6 |
4 files changed, 285 insertions, 3 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 4752294e5..b9f44485f 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -5806,7 +5806,11 @@ static int dahdi_indicate(struct ast_channel *chan, int condition, const void *d && p->pri && !p->outgoing) { if (p->pri->pri) { if (!pri_grab(p, p->pri)) { +#ifdef HAVE_PRI_PROG_W_CAUSE pri_progress_with_cause(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1, PRI_CAUSE_USER_BUSY); /* cause = 17 */ +#else + pri_progress(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1); +#endif pri_rel(p->pri); } else @@ -5903,7 +5907,11 @@ static int dahdi_indicate(struct ast_channel *chan, int condition, const void *d && p->pri && !p->outgoing) { if (p->pri->pri) { if (!pri_grab(p, p->pri)) { +#ifdef HAVE_PRI_PROG_W_CAUSE pri_progress_with_cause(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1, -1); /* no cause at all */ +#else + pri_progress(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1); +#endif pri_rel(p->pri); } else @@ -5939,7 +5947,11 @@ static int dahdi_indicate(struct ast_channel *chan, int condition, const void *d && p->pri && !p->outgoing) { if (p->pri) { if (!pri_grab(p, p->pri)) { +#ifdef HAVE_PRI_PROG_W_CAUSE pri_progress_with_cause(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1, PRI_CAUSE_SWITCH_CONGESTION); /* cause = 42 */ +#else + pri_progress(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1); +#endif pri_rel(p->pri); } else ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->span); @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 153709 . +# From configure.ac Revision: 154151 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -39713,7 +39713,7 @@ if test "x${PBX_PRI}" != "x1" -a "${USE_PRI}" != "no"; then pbxlibdir="-L${PRI_DIR}" fi fi - pbxfuncname="pri_progress_with_cause" + pbxfuncname="pri_new_bri" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_PRI_FOUND=yes else @@ -39965,6 +39965,268 @@ fi +if test "x${PBX_PRI_PROG_W_CAUSE}" != "x1" -a "${USE_PRI_PROG_W_CAUSE}" != "no"; then + pbxlibdir="" + # if --with-PRI_PROG_W_CAUSE=DIR has been specified, use it. + if test "x${PRI_PROG_W_CAUSE_DIR}" != "x"; then + if test -d ${PRI_PROG_W_CAUSE_DIR}/lib; then + pbxlibdir="-L${PRI_PROG_W_CAUSE_DIR}/lib" + else + pbxlibdir="-L${PRI_PROG_W_CAUSE_DIR}" + fi + fi + pbxfuncname="pri_progress_with_cause" + if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers + AST_PRI_PROG_W_CAUSE_FOUND=yes + else + as_ac_Lib=`echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpri" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lpri... $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="-lpri ${pbxlibdir} $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_PRI_PROG_W_CAUSE_FOUND=yes +else + AST_PRI_PROG_W_CAUSE_FOUND=no +fi + + fi + + # now check for the header. + if test "${AST_PRI_PROG_W_CAUSE_FOUND}" = "yes"; then + PRI_PROG_W_CAUSE_LIB="${pbxlibdir} -lpri " + # if --with-PRI_PROG_W_CAUSE=DIR has been specified, use it. + if test "x${PRI_PROG_W_CAUSE_DIR}" != "x"; then + PRI_PROG_W_CAUSE_INCLUDE="-I${PRI_PROG_W_CAUSE_DIR}/include" + fi + PRI_PROG_W_CAUSE_INCLUDE="${PRI_PROG_W_CAUSE_INCLUDE} " + if test "xlibpri.h" = "x" ; then # no header, assume found + PRI_PROG_W_CAUSE_HEADER_FOUND="1" + else # check for the header + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${PRI_PROG_W_CAUSE_INCLUDE}" + if test "${ac_cv_header_libpri_h+set}" = set; then + { echo "$as_me:$LINENO: checking for libpri.h" >&5 +echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; } +if test "${ac_cv_header_libpri_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5 +echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking libpri.h usability" >&5 +echo $ECHO_N "checking libpri.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 <libpri.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 libpri.h presence" >&5 +echo $ECHO_N "checking libpri.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 <libpri.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: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: libpri.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: libpri.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: libpri.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: libpri.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: libpri.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: libpri.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: libpri.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 libpri.h" >&5 +echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; } +if test "${ac_cv_header_libpri_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_libpri_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5 +echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; } + +fi +if test $ac_cv_header_libpri_h = yes; then + PRI_PROG_W_CAUSE_HEADER_FOUND=1 +else + PRI_PROG_W_CAUSE_HEADER_FOUND=0 +fi + + + CPPFLAGS="${saved_cppflags}" + fi + if test "x${PRI_PROG_W_CAUSE_HEADER_FOUND}" = "x0" ; then + PRI_PROG_W_CAUSE_LIB="" + PRI_PROG_W_CAUSE_INCLUDE="" + else + if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library + PRI_PROG_W_CAUSE_LIB="" + fi + PBX_PRI_PROG_W_CAUSE=1 + # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED + +cat >>confdefs.h <<_ACEOF +#define HAVE_PRI_PROG_W_CAUSE 1 +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define HAVE_PRI_PROG_W_CAUSE_VERSION +_ACEOF + + fi + fi +fi + + + if test "x${PBX_PRI_INBANDDISCONNECT}" != "x1" -a "${USE_PRI_INBANDDISCONNECT}" != "no"; then pbxlibdir="" # if --with-PRI_INBANDDISCONNECT=DIR has been specified, use it. diff --git a/configure.ac b/configure.ac index b3672b6c6..596424143 100644 --- a/configure.ac +++ b/configure.ac @@ -1365,7 +1365,9 @@ AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h]) AST_EXT_LIB_CHECK([PORTAUDIO], [portaudio], [Pa_GetDeviceCount], [portaudio.h]) -AST_EXT_LIB_CHECK([PRI], [pri], [pri_progress_with_cause], [libpri.h]) +AST_EXT_LIB_CHECK([PRI], [pri], [pri_new_bri], [libpri.h]) + +AST_EXT_LIB_CHECK([PRI_PROG_W_CAUSE], [pri], [pri_progress_with_cause], [libpri.h]) AST_EXT_LIB_CHECK([PRI_INBANDDISCONNECT], [pri], [pri_set_inbanddisconnect], [libpri.h]) diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 983f2cc37..ccfcd83b2 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -623,6 +623,12 @@ /* Define to indicate the ${PRI_INBANDDISCONNECT_DESCRIP} library version */ #undef HAVE_PRI_INBANDDISCONNECT_VERSION +/* Define this to indicate the ${PRI_PROG_W_CAUSE_DESCRIP} library */ +#undef HAVE_PRI_PROG_W_CAUSE + +/* Define to indicate the ${PRI_PROG_W_CAUSE_DESCRIP} library version */ +#undef HAVE_PRI_PROG_W_CAUSE_VERSION + /* Define to indicate the ${PRI_DESCRIP} library version */ #undef HAVE_PRI_VERSION |