kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 278984 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r278984 | tilghman | 2010-07-23 12:04:15 -0500 (Fri, 23 Jul 2010) | 5 lines
  
  Establish a maximum version for openh323 (i.e. not opal), because chan_h323 will fail to load, even if it links.
  
  (issue #17679)
  Reported by: am
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278985 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-07-23 17:05:16 +00:00
parent ec482eac9c
commit f90409101e
3 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
autoconf/ast_check_pwlib.m4
View File

@@ -204,15 +204,25 @@ AC_DEFUN([AST_CHECK_PWLIB_VERSION], [
$2_BUILD_NUMBER=`echo ${$2_VERSION} | cut -f3 -d.`
$2_VER=$((${$2_MAJOR_VERSION}*10000+${$2_MINOR_VERSION}*100+${$2_BUILD_NUMBER}))
$2_REQ=$(($4*10000+$5*100+$6))
if test "x$10" = "x"; then
let $2_MAX=9999999
else
let $2_MAX=$8*10000+$9*100+$10
fi
AC_MSG_CHECKING(if $1 version ${$2_VERSION} is compatible with chan_h323)
if test ${$2_VER} -lt ${$2_REQ}; then
AC_MSG_RESULT(no)
unset HAS_$2
else
if test ${$2_VER} -gt ${$2_MAX}; then
AC_MSG_RESULT(no)
unset HAS_$2
else
AC_MSG_RESULT(yes)
fi
fi
fi
])
AC_DEFUN([AST_CHECK_PWLIB_BUILD], [

22
configure vendored
View File

@@ -41594,11 +41594,21 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
PWLIB_BUILD_NUMBER=`echo ${PWLIB_VERSION} | cut -f3 -d.`
PWLIB_VER=$((${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER}))
PWLIB_REQ=$((1*10000+9*100+2))
if test "x" = "x"; then
let PWLIB_MAX=9999999
else
let PWLIB_MAX=*10000+*100+
fi
{ echo "$as_me:$LINENO: checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323" >&5
echo $ECHO_N "checking if PWLib version ${PWLIB_VERSION} is compatible with chan_h323... $ECHO_C" >&6; }
if test ${PWLIB_VER} -lt ${PWLIB_REQ}; then
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
unset HAS_PWLIB
else
if test ${PWLIB_VER} -gt ${PWLIB_MAX}; then
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
unset HAS_PWLIB
else
@@ -41606,6 +41616,7 @@ echo "${ECHO_T}no" >&6; }
echo "${ECHO_T}yes" >&6; }
fi
fi
fi
if test "${HAS_PWLIB:-unset}" != "unset"; then
@@ -42375,11 +42386,21 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
OPENH323_BUILD_NUMBER=`echo ${OPENH323_VERSION} | cut -f3 -d.`
OPENH323_VER=$((${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER}))
OPENH323_REQ=$((1*10000+17*100+3))
if test "x0" = "x"; then
let OPENH323_MAX=9999999
else
let OPENH323_MAX=1*10000+19*100+0
fi
{ echo "$as_me:$LINENO: checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323" >&5
echo $ECHO_N "checking if OpenH323 version ${OPENH323_VERSION} is compatible with chan_h323... $ECHO_C" >&6; }
if test ${OPENH323_VER} -lt ${OPENH323_REQ}; then
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
unset HAS_OPENH323
else
if test ${OPENH323_VER} -gt ${OPENH323_MAX}; then
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
unset HAS_OPENH323
else
@@ -42387,6 +42408,7 @@ echo "${ECHO_T}no" >&6; }
echo "${ECHO_T}yes" >&6; }
fi
fi
fi
if test "${HAS_OPENH323:-unset}" != "unset"; then

2
configure.ac
View File

@@ -1708,7 +1708,7 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "no" ; then
OPENH323DIR="${OPENH323_DIR}"
fi
AST_CHECK_OPENH323()
AST_CHECK_PWLIB_VERSION([OpenH323], [OPENH323], [openh323buildopts.h], [1], [17], [3])
AST_CHECK_PWLIB_VERSION([OpenH323], [OPENH323], [openh323buildopts.h], [1], [17], [3], [], [1], [19], [0])
AST_CHECK_OPENH323_BUILD()
PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}"
AST_CHECK_PWLIB_BUILD([OpenH323], [OPENH323],