diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-25 17:16:11 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-25 17:16:11 +0000 |
| commit | 84d217dc977b2f2319e118a08a07c88b9319ff17 (patch) | |
| tree | 6cd81cbbefe0de0f4d6f6a86996fe6c9071f46bd /acinclude.m4 | |
| parent | 89dd4029ec73ab0509955c35d89626d01d47b224 (diff) | |
Merged revisions 77071 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r77071 | file | 2007-07-25 14:14:14 -0300 (Wed, 25 Jul 2007) | 2 lines
Fix autoconf logic for finding OpenH323 when it is not in the first place searched (/usr/share/openh323).
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@77072 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 1363a9e20..ca589d312 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -380,13 +380,22 @@ if test "${HAS_OPENH323:-unset}" = "unset" ; then AC_CHECK_HEADER(${PWLIBDIR}/../openh323/version.h, OPENH323DIR="${PWLIBDIR}/../openh323"; HAS_OPENH323=1, ) if test "${HAS_OPENH323:-unset}" != "unset" ; then OPENH323DIR="${PWLIBDIR}/../openh323" - AC_CHECK_HEADER(${OPENH323DIR}/include/h323.h, , OPENH323_INCDIR="${PWLIB_INCDIR}/openh323"; OPENH323_LIBDIR="${PWLIB_LIBDIR}") + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} -I${PWLIB_INCDIR}/openh323 -I${PWLIB_INCDIR}" + AC_CHECK_HEADER(${OPENH323DIR}/include/h323.h, , OPENH323_INCDIR="${PWLIB_INCDIR}/openh323"; OPENH323_LIBDIR="${PWLIB_LIBDIR}", [#include <ptlib.h>]) + CPPFLAGS="${saved_cppflags}" else + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} -I${HOME}/openh323/include -I${PWLIB_INCDIR}" AC_CHECK_HEADER(${HOME}/openh323/include/h323.h, HAS_OPENH323=1, ) + CPPFLAGS="${saved_cppflags}" if test "${HAS_OPENH323:-unset}" != "unset" ; then OPENH323DIR="${HOME}/openh323" else + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} -I/usr/local/include/openh323 -I${PWLIB_INCDIR}" AC_CHECK_HEADER(/usr/local/include/openh323/h323.h, HAS_OPENH323=1, ) + CPPFLAGS="${saved_cppflags}" if test "${HAS_OPENH323:-unset}" != "unset" ; then OPENH323DIR="/usr/local/share/openh323" OPENH323_INCDIR="/usr/local/include/openh323" @@ -396,7 +405,10 @@ if test "${HAS_OPENH323:-unset}" = "unset" ; then OPENH323_LIBDIR="/usr/local/lib" fi else - AC_CHECK_HEADER(/usr/include/openh323/h323.h, HAS_OPENH323=1, ) + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} -I/usr/include/openh323 -I${PWLIB_INCDIR}" + AC_CHECK_HEADER(/usr/include/openh323/h323.h, HAS_OPENH323=1, , [#include <ptlib.h>]) + CPPFLAGS="${saved_cppflags}" if test "${HAS_OPENH323:-unset}" != "unset" ; then OPENH323DIR="/usr/share/openh323" OPENH323_INCDIR="/usr/include/openh323" |