diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-03 16:12:58 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-03 16:12:58 +0000 |
| commit | 08d657b9ec52f2237bf0b5d3bd737b5a3992408b (patch) | |
| tree | 983820b447bff62c71159d528620acd1f14e8dba /acinclude.m4 | |
| parent | 61b6de4e16736df453e61eead1ac1c574305e0f5 (diff) | |
ensure that DAHDI_INCLUDE and ZAPTEL_INCLUDE are added in all the places needed
improve AST_EXT_LIB_CHECK to accept (and remember) additional CFLAGS data like it does in trunk already
(closes issue #12911)
Reported by: tzafrir
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@127754 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 106688b69..14271237b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -42,7 +42,7 @@ AC_SUBST([$1_DIR]) AC_SUBST([PBX_$1]) ]) -# AST_EXT_LIB_CHECK([package symbol name], [package library name], [function to check], [package header], [additional LIB data]) +# AST_EXT_LIB_CHECK([package symbol name], [package library name], [function to check], [package header], [additional LIB data], [additional INCLUDE data]) AC_DEFUN([AST_EXT_LIB_CHECK], [ @@ -63,17 +63,14 @@ if test "${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]) - fi - CPPFLAGS="${saved_cppflags}" - else - if test "x$4" != "x" ; then - AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0]) - fi fi + $1_INCLUDE="${$1_INCLUDE} $6" + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}" + if test "x$4" != "x" ; then + AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0]) + fi + CPPFLAGS="${saved_cppflags}" if test "x${$1_HEADER_FOUND}" = "x0" ; then if test -n "${$1_MANDATORY}" ; then |