diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-05-01 09:38:32 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-05-01 09:38:32 +0000 |
commit | 523d899f3d208e15fac795519f26973baccfa2f1 (patch) | |
tree | 0f321a50a708f13db1fb58c7fd0c15c3aca28344 | |
parent | dfdf6e1f76aa19e7974e9defdfc8fa9dc9494d8d (diff) |
do check for ixjuser.h in a way that can actually succeed :-)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23875 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | configure.ac | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 39967212c..c90b53898 100644 --- a/configure.ac +++ b/configure.ac @@ -308,14 +308,15 @@ AC_SUBST([pq_INCLUDE]) AC_SUBST([pq_LIB]) AC_SUBST([PBX_LIBpq]) -PBX_H323=0 -AC_CHECK_HEADER([h323.h], [PBX_H323=1], []) +AC_CHECK_HEADER([h323.h], [PBX_H323=1], [PBX_H323=0]) AC_SUBST(PBX_H323) -PBX_IXJUSER=0 -AC_CHECK_HEADER([linux/ixjuser.h], [ - AC_CHECK_HEADER([linux/telephony.h], [ - AC_CHECK_HEADER([linux/version.h], [PBX_IXJUSER=1])])]) +AC_CHECK_HEADER([linux/ixjuser.h], [PBX_IXJUSER=1], [PBX_IXJUSER=0], [ + #include <linux/version.h> + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + #include <linux/compiler.h> + #endif + ]) AC_SUBST(PBX_IXJUSER) AC_ARG_WITH([vpb], AC_HELP_STRING([--with-vpb=PATH],[use vpb files in PATH]),[ |