[dahdi-commits] seanbright: tools/trunk r5662 - in /tools/trunk: configure configure.ac

[SVN commits to the DAHDI project]

Author: seanbright
Date: Fri Jan 16 08:18:10 2009
New Revision: 5662

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=5662
Log:
Properly detect GENERIC_HDLC_VERSION on various kernel versions.

(closes issue #14150)
Reported by: ccesario
Patches:
      20090115__bug14150.diff.txt uploaded by seanbright (license 71)
Tested by: ccesario

Modified:
    tools/trunk/configure
    tools/trunk/configure.ac

Modified: tools/trunk/configure.ac
URL: http://svn.digium.com/svn-view/dahdi/tools/trunk/configure.ac?view=diff&rev=5662&r1=5661&r2=5662
==============================================================================
--- tools/trunk/configure.ac (original)
+++ tools/trunk/configure.ac Fri Jan 16 08:18:10 2009
@@ -90,7 +90,43 @@
 AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
 AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h])
 
-AST_C_DEFINE_CHECK([HDLC], [GENERIC_HDLC_VERSION], [linux/hdlc.h], [4])
+PBX_HDLC=0
+AC_MSG_CHECKING([for GENERIC_HDLC_VERSION version 4 in linux/hdlc.h])
+AC_COMPILE_IFELSE(
+    [ AC_LANG_PROGRAM( [#include <linux/hdlc.h>],
+	    [#if defined(GENERIC_HDLC_VERSION) && GENERIC_HDLC_VERSION >= 4
+		int foo = 0;
+		#else
+		int foo = bar;
+		#endif
+		0])],
+	[AC_MSG_RESULT(yes)
+	 PBX_HDLC=1],
+	[AC_MSG_RESULT(no)]
+)
+if test $PBX_HDLC = 0; then
+    AC_MSG_CHECKING([for GENERIC_HDLC_VERSION version 4 in linux/hdlc/ioctl.h])
+    AC_COMPILE_IFELSE(
+	    [ AC_LANG_PROGRAM( [
+		    #include <sys/socket.h>
+			#include <linux/if.h>],
+			[#if defined(GENERIC_HDLC_VERSION) && GENERIC_HDLC_VERSION >= 4
+			int foo = 0;
+			#else
+			int foo = bar;
+			#endif
+			0])],
+		[AC_MSG_RESULT(yes)
+		 PBX_HDLC=1],
+		[AC_MSG_RESULT(no)]
+	)
+fi
+
+if test "x${PBX_HDLC}" != "x1"; then
+   AC_MSG_NOTICE([GENERIC_HDLC_VERSION (version 4) not found, disabling sethdlc.])
+fi
+
+AC_SUBST(PBX_HDLC)
 
 AC_ARG_WITH(selinux,
 	[AS_HELP_STRING([--with-selinux],
@@ -146,16 +182,6 @@
 	;;
 esac
 
-if test "x${PBX_HDLC}" == "x1"; then
-   AC_EGREP_CPP([VERSION = 4],
-		[#include <linux/hdlc.h>
-		VERSION = GENERIC_HDLC_VERSION], [], [PBX_HDLC=0])
-fi
-
-if test "x${PBX_HDLC}" != "x1"; then
-   AC_MSG_NOTICE([GENERIC_HDLC_VERSION version 4 not found, disabling sethdlc.])
-fi
-
 if test "x${PBX_DAHDI}" != "x1"; then
    AC_MSG_NOTICE([***])
    AC_MSG_NOTICE([*** Building this package requires DAHDI support. *** ])