diff options
author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-10 19:14:10 +0000 |
---|---|---|
committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-10 19:14:10 +0000 |
commit | 40a41d31f901f2f7d3018b90856f7c0cfa84a48b (patch) | |
tree | 4767d6f9fb9feef0269a5c7d307374933b8e545c /acinclude.m4 | |
parent | 040f3e644dc1e70bbb97c323ca1ca6e8ea7d51cf (diff) |
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)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@142419 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 59566d075..865285cc0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -555,7 +555,7 @@ fi 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.` |