[asterisk-commits] tilghman: trunk r278985 - in /trunk: ./ autoconf/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jul 23 12:05:16 2010
New Revision: 278985

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=278985
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/autoconf/ast_check_pwlib.m4
    trunk/configure
    trunk/configure.ac

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/autoconf/ast_check_pwlib.m4
URL: http://svnview.digium.com/svn/asterisk/trunk/autoconf/ast_check_pwlib.m4?view=diff&rev=278985&r1=278984&r2=278985
==============================================================================
--- trunk/autoconf/ast_check_pwlib.m4 (original)
+++ trunk/autoconf/ast_check_pwlib.m4 Fri Jul 23 12:05:16 2010
@@ -204,13 +204,23 @@
 		$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
 ])

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=278985&r1=278984&r2=278985
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Jul 23 12:05:16 2010
@@ -1708,7 +1708,7 @@
 		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],