diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-23 17:06:17 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-23 17:06:17 +0000 |
commit | f599168183a520f98df658d407d414b65d84384f (patch) | |
tree | 635b30f8c85d5833731056be2f15abd0b5888682 /configure | |
parent | e69ee322da87401f9c451d580f1604f2148da0cc (diff) |
Merged revisions 278985 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r278985 | tilghman | 2010-07-23 12:05:16 -0500 (Fri, 23 Jul 2010) | 12 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@278986 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 26 |
1 files changed, 24 insertions, 2 deletions
@@ -33900,6 +33900,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu PWLIB_BUILD_NUMBER=`echo ${PWLIB_VERSION} | cut -f3 -d.` let PWLIB_VER=${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER} let 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; } @@ -33908,8 +33913,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 @@ -34681,6 +34692,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu OPENH323_BUILD_NUMBER=`echo ${OPENH323_VERSION} | cut -f3 -d.` let OPENH323_VER=${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER} let 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; } @@ -34689,8 +34705,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 |