Merged revisions 278984 via svnmerge from

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

26
configure vendored
View File

@@ -41594,6 +41594,11 @@ 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; }
@@ -41602,8 +41607,14 @@ echo $ECHO_N "checking if PWLib version ${PWLIB_VERSION} is compatible with chan
echo "${ECHO_T}no" >&6; }
unset HAS_PWLIB
else
{ echo "$as_me:$LINENO: result: yes" >&5
if test ${PWLIB_VER} -gt ${PWLIB_MAX}; then
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
unset HAS_PWLIB
else
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
fi
fi
fi
@@ -42375,6 +42386,11 @@ 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; }
@@ -42383,8 +42399,14 @@ echo $ECHO_N "checking if OpenH323 version ${OPENH323_VERSION} is compatible wit
echo "${ECHO_T}no" >&6; }
unset HAS_OPENH323
else
{ echo "$as_me:$LINENO: result: yes" >&5
if test ${OPENH323_VER} -gt ${OPENH323_MAX}; then
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
unset HAS_OPENH323
else
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
fi
fi
fi