aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-01 09:38:32 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-01 09:38:32 +0000
commitdb8e06ec8dc81f5a75ce8bcec16a6f001264c022 (patch)
tree0f321a50a708f13db1fb58c7fd0c15c3aca28344 /configure.ac
parentfd0496bb949bf88961b2d54a78667af80910eeb3 (diff)
do check for ixjuser.h in a way that can actually succeed :-)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@23875 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac13
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]),[