[asterisk-commits] seanbright: branch 1.6.0 r142418 - in /branches/1.6.0: ./ acinclude.m4 configure

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed Sep 10 14:12:16 2008
New Revision: 142418

URL: http://svn.digium.com/view/asterisk?view=rev&rev=142418
Log:
Merged revisions 142417 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r142417 | seanbright | 2008-09-10 15:09:03 -0400 (Wed, 10 Sep 2008) | 17 lines

Merged revisions 142416 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r142416 | seanbright | 2008-09-10 15:05:46 -0400 (Wed, 10 Sep 2008) | 9 lines

Fix detection of PWLIB and OpenH323 version when spacing in the headers
isn't consistent.

(closes issue #13426)
Reported by: bamby
Patches:
      detect_openh323.diff uploaded by bamby (license 430)
      (Modified by me to use sed instead of tr)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/acinclude.m4
    branches/1.6.0/configure

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/acinclude.m4
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/acinclude.m4?view=diff&rev=142418&r1=142417&r2=142418
==============================================================================
--- branches/1.6.0/acinclude.m4 (original)
+++ branches/1.6.0/acinclude.m4 Wed Sep 10 14:12:16 2008
@@ -555,7 +555,7 @@
 AC_DEFUN(
 [AST_CHECK_PWLIB_VERSION], [
 	if test "${HAS_$2:-unset}" != "unset"; then
-		$2_VERSION=`grep "$2_VERSION" ${$2_INCDIR}/$3 | cut -f2 -d ' ' | sed -e 's/"//g'`
+		$2_VERSION=`grep "$2_VERSION" ${$2_INCDIR}/$3 | sed -e 's/[[[:space:]]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'`
 		$2_MAJOR_VERSION=`echo ${$2_VERSION} | cut -f1 -d.`
 		$2_MINOR_VERSION=`echo ${$2_VERSION} | cut -f2 -d.`
 		$2_BUILD_NUMBER=`echo ${$2_VERSION} | cut -f3 -d.`