do check for ixjuser.h in a way that can actually succeed :-)
authorKevin P. Fleming <kpfleming@digium.com>
Mon, 1 May 2006 09:38:32 +0000 (09:38 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Mon, 1 May 2006 09:38:32 +0000 (09:38 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23875 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configure.ac

index 3996721..c90b538 100644 (file)
@@ -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]),[