kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use AC_CHECK_HEADER to check for ptlib/openh323 to allow for cross compiling. (issue #9675 reported by zandbelt)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@74043 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-07-09 14:34:33 +00:00
parent befa215f7b
commit 475e3be7c0
2 changed files with 1396 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
acinclude.m4
View File

@@ -125,21 +125,22 @@ AC_DEFUN(
[AST_CHECK_PWLIB], [ [AST_CHECK_PWLIB], [
PWLIB_INCDIR= PWLIB_INCDIR=
PWLIB_LIBDIR= PWLIB_LIBDIR=
AC_LANG_PUSH([C++])
if test "${PWLIBDIR:-unset}" != "unset" ; then if test "${PWLIBDIR:-unset}" != "unset" ; then
AC_CHECK_FILE(${PWLIBDIR}/version.h, HAS_PWLIB=1, ) AC_CHECK_HEADER(${PWLIBDIR}/version.h, HAS_PWLIB=1, )
fi fi
if test "${HAS_PWLIB:-unset}" = "unset" ; then if test "${HAS_PWLIB:-unset}" = "unset" ; then
if test "${OPENH323DIR:-unset}" != "unset"; then if test "${OPENH323DIR:-unset}" != "unset"; then
AC_CHECK_FILE(${OPENH323DIR}/../pwlib/version.h, HAS_PWLIB=1, ) AC_CHECK_HEADER(${OPENH323DIR}/../pwlib/version.h, HAS_PWLIB=1, )
fi fi
if test "${HAS_PWLIB:-unset}" != "unset" ; then if test "${HAS_PWLIB:-unset}" != "unset" ; then
PWLIBDIR="${OPENH323DIR}/../pwlib" PWLIBDIR="${OPENH323DIR}/../pwlib"
else else
AC_CHECK_FILE(${HOME}/pwlib/include/ptlib.h, HAS_PWLIB=1, ) AC_CHECK_HEADER(${HOME}/pwlib/include/ptlib.h, HAS_PWLIB=1, )
if test "${HAS_PWLIB:-unset}" != "unset" ; then if test "${HAS_PWLIB:-unset}" != "unset" ; then
PWLIBDIR="${HOME}/pwlib" PWLIBDIR="${HOME}/pwlib"
else else
AC_CHECK_FILE(/usr/local/include/ptlib.h, HAS_PWLIB=1, ) AC_CHECK_HEADER(/usr/local/include/ptlib.h, HAS_PWLIB=1, )
if test "${HAS_PWLIB:-unset}" != "unset" ; then if test "${HAS_PWLIB:-unset}" != "unset" ; then
AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin) AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin)
if test "${PTLIB_CONFIG:-unset}" = "unset" ; then if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
@@ -157,7 +158,7 @@ if test "${HAS_PWLIB:-unset}" = "unset" ; then
PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs` PWLIB_LIB=`${PTLIB_CONFIG} --ldflags --libs`
PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`" PWLIB_LIB="-L${PWLIB_LIBDIR} `echo ${PWLIB_LIB}`"
else else
AC_CHECK_FILE(/usr/include/ptlib.h, HAS_PWLIB=1, ) AC_CHECK_HEADER(/usr/include/ptlib.h, HAS_PWLIB=1, )
if test "${HAS_PWLIB:-unset}" != "unset" ; then if test "${HAS_PWLIB:-unset}" != "unset" ; then
AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/pwlib/make) AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/pwlib/make)
PWLIB_INCDIR="/usr/include" PWLIB_INCDIR="/usr/include"
@@ -222,6 +223,7 @@ if test "${HAS_PWLIB:-unset}" != "unset" ; then
AC_SUBST([PWLIB_INCDIR]) AC_SUBST([PWLIB_INCDIR])
AC_SUBST([PWLIB_LIBDIR]) AC_SUBST([PWLIB_LIBDIR])
fi fi
AC_LANG_POP([C++])
]) ])
@@ -316,20 +318,21 @@ AC_DEFUN(
[AST_CHECK_OPENH323], [ [AST_CHECK_OPENH323], [
OPENH323_INCDIR= OPENH323_INCDIR=
OPENH323_LIBDIR= OPENH323_LIBDIR=
AC_LANG_PUSH([C++])
if test "${OPENH323DIR:-unset}" != "unset" ; then if test "${OPENH323DIR:-unset}" != "unset" ; then
AC_CHECK_FILE(${OPENH323DIR}/version.h, HAS_OPENH323=1, ) AC_CHECK_HEADER(${OPENH323DIR}/version.h, HAS_OPENH323=1, )
fi fi
if test "${HAS_OPENH323:-unset}" = "unset" ; then if test "${HAS_OPENH323:-unset}" = "unset" ; then
AC_CHECK_FILE(${PWLIBDIR}/../openh323/version.h, OPENH323DIR="${PWLIBDIR}/../openh323"; HAS_OPENH323=1, ) AC_CHECK_HEADER(${PWLIBDIR}/../openh323/version.h, OPENH323DIR="${PWLIBDIR}/../openh323"; HAS_OPENH323=1, )
if test "${HAS_OPENH323:-unset}" != "unset" ; then if test "${HAS_OPENH323:-unset}" != "unset" ; then
OPENH323DIR="${PWLIBDIR}/../openh323" OPENH323DIR="${PWLIBDIR}/../openh323"
AC_CHECK_FILE(${OPENH323DIR}/include/h323.h, , OPENH323_INCDIR="${PWLIB_INCDIR}/openh323"; OPENH323_LIBDIR="${PWLIB_LIBDIR}") AC_CHECK_HEADER(${OPENH323DIR}/include/h323.h, , OPENH323_INCDIR="${PWLIB_INCDIR}/openh323"; OPENH323_LIBDIR="${PWLIB_LIBDIR}")
else else
AC_CHECK_FILE(${HOME}/openh323/include/h323.h, HAS_OPENH323=1, ) AC_CHECK_HEADER(${HOME}/openh323/include/h323.h, HAS_OPENH323=1, )
if test "${HAS_OPENH323:-unset}" != "unset" ; then if test "${HAS_OPENH323:-unset}" != "unset" ; then
OPENH323DIR="${HOME}/openh323" OPENH323DIR="${HOME}/openh323"
else else
AC_CHECK_FILE(/usr/local/include/openh323/h323.h, HAS_OPENH323=1, ) AC_CHECK_HEADER(/usr/local/include/openh323/h323.h, HAS_OPENH323=1, )
if test "${HAS_OPENH323:-unset}" != "unset" ; then if test "${HAS_OPENH323:-unset}" != "unset" ; then
OPENH323DIR="/usr/local/share/openh323" OPENH323DIR="/usr/local/share/openh323"
OPENH323_INCDIR="/usr/local/include/openh323" OPENH323_INCDIR="/usr/local/include/openh323"
@@ -339,7 +342,7 @@ if test "${HAS_OPENH323:-unset}" = "unset" ; then
OPENH323_LIBDIR="/usr/local/lib" OPENH323_LIBDIR="/usr/local/lib"
fi fi
else else
AC_CHECK_FILE(/usr/include/openh323/h323.h, HAS_OPENH323=1, ) AC_CHECK_HEADER(/usr/include/openh323/h323.h, HAS_OPENH323=1, )
if test "${HAS_OPENH323:-unset}" != "unset" ; then if test "${HAS_OPENH323:-unset}" != "unset" ; then
OPENH323DIR="/usr/share/openh323" OPENH323DIR="/usr/share/openh323"
OPENH323_INCDIR="/usr/include/openh323" OPENH323_INCDIR="/usr/include/openh323"
@@ -370,6 +373,7 @@ if test "${HAS_OPENH323:-unset}" != "unset" ; then
AC_SUBST([OPENH323_INCDIR]) AC_SUBST([OPENH323_INCDIR])
AC_SUBST([OPENH323_LIBDIR]) AC_SUBST([OPENH323_LIBDIR])
fi fi
AC_LANG_POP([C++])
]) ])

1521
configure vendored
View File

File diff suppressed because it is too large Load Diff