diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-10 19:12:16 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-10 19:12:16 +0000 |
| commit | c3969e3105ecb5eeda72040da282f8f88ed95951 (patch) | |
| tree | 4eb8f3fc0e6d8596661b1d14e77af4ca74a136f1 | |
| parent | 2a5ef7cb58e1fe0e5165daf86d41b94a97628386 (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.0@142418 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rwxr-xr-x | configure | 18 |
2 files changed, 8 insertions, 12 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.` @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 134539 . +# From configure.ac Revision: 134651 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -12835,13 +12835,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <sys/types.h> /* for off_t */ - #include <stdio.h> +#include <stdio.h> int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -12881,13 +12879,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include <sys/types.h> /* for off_t */ - #include <stdio.h> +#include <stdio.h> int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -40995,7 +40991,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.` @@ -41943,7 +41939,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.` |