diff options
| -rw-r--r-- | autoconf/ast_check_pwlib.m4 | 12 | ||||
| -rwxr-xr-x | configure | 26 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 36 insertions, 4 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 ]) @@ -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 diff --git a/configure.ac b/configure.ac index 0b6748ee0..7e3901a6d 100644 --- a/configure.ac +++ b/configure.ac @@ -1547,7 +1547,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], |