[asterisk-commits] mjordan: branch 11 r380298 - in /branches/11: ./ autoconf/

[SVN commits to the Asterisk project]

Author: mjordan
Date: Mon Jan 28 20:09:51 2013
New Revision: 380298

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=380298
Log:
Update configure script to be compatible with ptlib 2.10.9

With ptlib 2.10.9, the configure script fails due to grep returning multiple
matches for the pattern it searches for. This patch updates the pattern
matching to return only the actual version for the symbol searched for,
PTLIB_VERSION.

(closes issue ASTERISK-20980)
Reported by: Stefan Reuter
patches:
  ASTERISK-20980-1.patch uploaded by Stefan Reuter (license 5339)
........

Merged revisions 380297 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/11/   (props changed)
    branches/11/autoconf/ast_check_pwlib.m4
    branches/11/configure

Propchange: branches/11/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Mon Jan 28 20:09:51 2013
@@ -1,1 +1,1 @@
-/branches/1.8:1-378147,378164,378356,378375,378427,378455-378456,378486,378514,378554,378591,378733,378776,378933,378967,379001,379145,379178,379226,379276,379310,379342,379392,379547,379608,379718,379825,379885,379963,380210,380254
+/branches/1.8:1-378147,378164,378356,378375,378427,378455-378456,378486,378514,378554,378591,378733,378776,378933,378967,379001,379145,379178,379226,379276,379310,379342,379392,379547,379608,379718,379825,379885,379963,380210,380254,380297

Modified: branches/11/autoconf/ast_check_pwlib.m4
URL: http://svnview.digium.com/svn/asterisk/branches/11/autoconf/ast_check_pwlib.m4?view=diff&rev=380298&r1=380297&r2=380298
==============================================================================
--- branches/11/autoconf/ast_check_pwlib.m4 (original)
+++ branches/11/autoconf/ast_check_pwlib.m4 Mon Jan 28 20:09:51 2013
@@ -198,7 +198,7 @@
 	fi
 
 	if test "${HAS_$2:-unset}" != "unset"; then
-		$2_VERSION=`grep "$VNAME" ${$2_INCDIR}/$3 | sed -e 's/[[[:space:]]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'`
+		$2_VERSION=`grep "$VNAME \"" ${$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.`