From 781d7e4c759e77a09f46eb36276cd981c541ccde Mon Sep 17 00:00:00 2001 From: seanbright Date: Wed, 10 Sep 2008 19:09:03 +0000 Subject: 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/trunk@142417 f38db490-d61c-443f-a65b-d21fe96a405b --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index ff4165f30..d86265cf9 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 135405 . +# From configure.ac Revision: 136819 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -41186,7 +41186,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "${HAS_PWLIB:-unset}" != "unset"; then - PWLIB_VERSION=`grep "PWLIB_VERSION" ${PWLIB_INCDIR}/ptbuildopts.h | cut -f2 -d ' ' | sed -e 's/"//g'` + PWLIB_VERSION=`grep "PWLIB_VERSION" ${PWLIB_INCDIR}/ptbuildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'` PWLIB_MAJOR_VERSION=`echo ${PWLIB_VERSION} | cut -f1 -d.` PWLIB_MINOR_VERSION=`echo ${PWLIB_VERSION} | cut -f2 -d.` PWLIB_BUILD_NUMBER=`echo ${PWLIB_VERSION} | cut -f3 -d.` @@ -42134,7 +42134,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "${HAS_OPENH323:-unset}" != "unset"; then - OPENH323_VERSION=`grep "OPENH323_VERSION" ${OPENH323_INCDIR}/openh323buildopts.h | cut -f2 -d ' ' | sed -e 's/"//g'` + OPENH323_VERSION=`grep "OPENH323_VERSION" ${OPENH323_INCDIR}/openh323buildopts.h | sed -e 's/[[:space:]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'` OPENH323_MAJOR_VERSION=`echo ${OPENH323_VERSION} | cut -f1 -d.` OPENH323_MINOR_VERSION=`echo ${OPENH323_VERSION} | cut -f2 -d.` OPENH323_BUILD_NUMBER=`echo ${OPENH323_VERSION} | cut -f3 -d.` -- cgit v1.2.3