aboutsummaryrefslogtreecommitdiffstats
path: root/autoconf
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-23 17:06:17 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-23 17:06:17 +0000
commitf599168183a520f98df658d407d414b65d84384f (patch)
tree635b30f8c85d5833731056be2f15abd0b5888682 /autoconf
parente69ee322da87401f9c451d580f1604f2148da0cc (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 'autoconf')
-rw-r--r--autoconf/ast_check_pwlib.m412
1 files changed, 11 insertions, 1 deletions
diff --git a/autoconf/ast_check_pwlib.m4 b/autoconf/ast_check_pwlib.m4
index f92fb2cac..d56de97a8 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.`
let $2_VER=${$2_MAJOR_VERSION}*10000+${$2_MINOR_VERSION}*100+${$2_BUILD_NUMBER}
let $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
])