From: Kevin P. Fleming <kpfleming@digium.com>
Date: Mon, 1 May 2006 09:38:32 +0000 (+0000)
Subject: do check for ixjuser.h in a way that can actually succeed :-)
X-Git-Tag: 1.4.0-beta1~1652
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=523d899f3d208e15fac795519f26973baccfa2f1;p=thirdparty%2Fasterisk.git

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
---

diff --git a/configure.ac b/configure.ac
index 39967212cf..c90b53898b 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]),[