diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-23 17:05:16 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-23 17:05:16 +0000 |
| commit | 2ea9f963899ee2157bbbc2c9b39f266cb1b5b0df (patch) | |
| tree | 5610a01778daa9d53bed6a92551396246a881f25 /autoconf | |
| parent | 8c187a70f6aceb0f8c49f3e68ecd50648b1438c2 (diff) | |
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/trunk@278985 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'autoconf')
| -rw-r--r-- | autoconf/ast_check_pwlib.m4 | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/autoconf/ast_check_pwlib.m4 b/autoconf/ast_check_pwlib.m4 index 876c50849..98f3eb7aa 100644 --- a/autoconf/ast_check_pwlib.m4 +++ b/autoconf/ast_check_pwlib.m4 @@ -204,13 +204,23 @@ 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 - AC_MSG_RESULT(yes) + if test ${$2_VER} -gt ${$2_MAX}; then + AC_MSG_RESULT(no) + unset HAS_$2 + else + AC_MSG_RESULT(yes) + fi fi fi ]) |