[svn-commits] seanbright: tools/trunk r4977 - in /tools/trunk: ./ build_tools/

[SVN commits to the Digium repositories]

Author: seanbright
Date: Wed Sep 24 14:54:08 2008
New Revision: 4977

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4977
Log:
Re-enable sethdlc by default in menuselect.  Add configure checks to properly
discover the linux/hdlc.h dependency.

Modified:
    tools/trunk/build_tools/menuselect-deps.in
    tools/trunk/configure
    tools/trunk/configure.ac
    tools/trunk/dahdi.xml

Modified: tools/trunk/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/dahdi/tools/trunk/build_tools/menuselect-deps.in?view=diff&rev=4977&r1=4976&r2=4977
==============================================================================
--- tools/trunk/build_tools/menuselect-deps.in (original)
+++ tools/trunk/build_tools/menuselect-deps.in Wed Sep 24 14:54:08 2008
@@ -1,1 +1,2 @@
 LIBNEWT=@PBX_NEWT@
+HDLC=@PBX_HDLC@

Modified: tools/trunk/configure.ac
URL: http://svn.digium.com/view/dahdi/tools/trunk/configure.ac?view=diff&rev=4977&r1=4976&r2=4977
==============================================================================
--- tools/trunk/configure.ac (original)
+++ tools/trunk/configure.ac Wed Sep 24 14:54:08 2008
@@ -90,6 +90,8 @@
 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])
+
 AC_ARG_WITH(selinux,
 	[AS_HELP_STRING([--with-selinux],
 			[enable (with) / disable (without) SELinux])],
@@ -144,6 +146,16 @@
 	;;
 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. *** ])

Modified: tools/trunk/dahdi.xml
URL: http://svn.digium.com/view/dahdi/tools/trunk/dahdi.xml?view=diff&rev=4977&r1=4976&r2=4977
==============================================================================
--- tools/trunk/dahdi.xml (original)
+++ tools/trunk/dahdi.xml Wed Sep 24 14:54:08 2008
@@ -5,7 +5,7 @@
 		<defaultenabled>no</defaultenabled>
 	</member>
 	<member name="sethdlc" remove_on_change="sethdlc sethdlc.o">
-		<defaultenabled>no</defaultenabled>
+		<depend>hdlc</depend>
 	</member>
 	<member name="dahdi_cfg" remove_on_change="dahdi_cfg dahdi_cfg.o">
 	</member>