diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-06 00:00:19 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-06 00:00:19 +0000 |
| commit | 5fab9aa7378ab7aa9b515cc59126c86efc68d941 (patch) | |
| tree | 629902b77f70074ab934c61130f05e47dbeb4a92 /acinclude.m4 | |
| parent | 717d699a13256383243efc4b009950ef7d464b43 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@49730 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index a32e071d1..28440b3ab 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -123,9 +123,12 @@ if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then if test "x${$1_DIR}" != "x"; then $1_LIB="${pbxlibdir} ${$1_LIB}" $1_INCLUDE="-I${$1_DIR}/include" + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} -I${$1_DIR}/include" 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 + CPPFLAGS="${saved_cppflags}" else if test "x$4" != "x" ; then AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0]) |