Backport support for Zaptel/DAHDI channel-level alarms from trunk/1.6, because not doing so just makes it difficult for people with channels that are in alarm when Asterisk starts up to get them going once the alarm is cleared

(closes issue #12160)
Reported by: tzafrir
Patches:
      asterisk-chanalarms_14.patch uploaded by tzafrir (license 46)
Tested by: tzafrir


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@139145 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-08-20 19:35:59 +00:00
parent 811faa8612
commit e2fc623d88
4 changed files with 147 additions and 4 deletions

114
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 136999 .
# From configure.ac Revision: 137677 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.4.
#
@@ -30475,6 +30475,118 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_ZAPTEL 1
_ACEOF
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${ZAPTEL_INCLUDE}"
{ echo "$as_me:$LINENO: checking for ZT_PARAMS.chan_alarms" >&5
echo $ECHO_N "checking for ZT_PARAMS.chan_alarms... $ECHO_C" >&6; }
if test "${ac_cv_member_ZT_PARAMS_chan_alarms+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <zaptel/zaptel.h>
int
main ()
{
static ZT_PARAMS ac_aggr;
if (ac_aggr.chan_alarms)
return 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
ac_cv_member_ZT_PARAMS_chan_alarms=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <zaptel/zaptel.h>
int
main ()
{
static ZT_PARAMS ac_aggr;
if (sizeof ac_aggr.chan_alarms)
return 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
ac_cv_member_ZT_PARAMS_chan_alarms=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_ZT_PARAMS_chan_alarms=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_member_ZT_PARAMS_chan_alarms" >&5
echo "${ECHO_T}$ac_cv_member_ZT_PARAMS_chan_alarms" >&6; }
CPPFLAGS="${saved_cppflags}"
if test "${ac_cv_member_ZT_PARAMS_chan_alarms}" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_ZAPTEL_CHANALARMS 1
_ACEOF
else
cat >>confdefs.h <<\_ACEOF
#define HAVE_ZAPTEL_CHANALARMS 0
_ACEOF
fi
elif test -n "${ZAPTEL_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5