mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-06 04:30:28 +00:00
Merged revisions 49714-49715 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r49714 | kpfleming | 2007-01-05 17:49:52 -0600 (Fri, 05 Jan 2007) | 2 lines proper fix for r49712 ........ r49715 | kpfleming | 2007-01-05 17:51:31 -0600 (Fri, 05 Jan 2007) | 2 lines one more time... ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49730 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -123,9 +123,12 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
|
|||||||
if test "x${$1_DIR}" != "x"; then
|
if test "x${$1_DIR}" != "x"; then
|
||||||
$1_LIB="${pbxlibdir} ${$1_LIB}"
|
$1_LIB="${pbxlibdir} ${$1_LIB}"
|
||||||
$1_INCLUDE="-I${$1_DIR}/include"
|
$1_INCLUDE="-I${$1_DIR}/include"
|
||||||
|
saved_cppflags="${CPPFLAGS}"
|
||||||
|
CPPFLAGS="${CPPFLAGS} -I${$1_DIR}/include"
|
||||||
if test "x$4" != "x" ; then
|
if test "x$4" != "x" ; then
|
||||||
AC_CHECK_HEADER([${$1_DIR}/include/$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0], -I${$1_DIR}/include)
|
AC_CHECK_HEADER([${$1_DIR}/include/$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
|
||||||
fi
|
fi
|
||||||
|
CPPFLAGS="${saved_cppflags}"
|
||||||
else
|
else
|
||||||
if test "x$4" != "x" ; then
|
if test "x$4" != "x" ; then
|
||||||
AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
|
AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
|
||||||
|
Reference in New Issue
Block a user