Re-enable sethdlc by default in menuselect. Add configure checks to properly

discover the linux/hdlc.h dependency.


git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4977 a0bf4364-ded3-4de4-8d8a-66a801d63aff

4 files changed, 120 insertions, 3 deletions

diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
index 2f61b24..d8ff845 100644
--- a/build_tools/menuselect-deps.in
+++ b/build_tools/menuselect-deps.in
@@ -1 +1,2 @@
 LIBNEWT=@PBX_NEWT@
+HDLC=@PBX_HDLC@
diff --git a/configure b/configure
index 48c55f4..8b154cf 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 4845 .
+# From configure.ac Revision: 4904 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -690,6 +690,7 @@ USB_INCLUDE
 USB_DIR
 PBX_USB
 EGREP
+PBX_HDLC
 USE_SELINUX
 ASCIIDOC
 PPPD_VERSION
@@ -4420,6 +4421,83 @@ fi
 
 
 
+    if test "x${PBX_HDLC}" != "x1"; then
+	{ echo "$as_me:$LINENO: checking for GENERIC_HDLC_VERSION in linux/hdlc.h" >&5
+echo $ECHO_N "checking for GENERIC_HDLC_VERSION in linux/hdlc.h... $ECHO_C" >&6; }
+	saved_cppflags="${CPPFLAGS}"
+	if test "x${HDLC_DIR}" != "x"; then
+	    HDLC_INCLUDE="-I${HDLC_DIR}/include"
+	fi
+	CPPFLAGS="${CPPFLAGS} ${HDLC_INCLUDE}"
+
+	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <linux/hdlc.h>
+int
+main ()
+{
+#if defined(GENERIC_HDLC_VERSION)
+				int foo = 0;
+			        #else
+			        int foo = bar;
+			        #endif
+				0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+     { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+		PBX_HDLC=1
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_HDLC 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_HDLC_VERSION 4
+_ACEOF
+
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	   { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	CPPFLAGS="${saved_cppflags}"
+    fi
+
+
+
+
 # Check whether --with-selinux was given.
 if test "${with_selinux+set}" = set; then
   withval=$with_selinux; USE_SELINUX=$withval
@@ -4482,6 +4560,31 @@ echo "$as_me: error: failed to find pppd/patchlevel.h: no ppp support." >&2;}
 	;;
 esac
 
+if test "x${PBX_HDLC}" == "x1"; then
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <linux/hdlc.h>
+		VERSION = GENERIC_HDLC_VERSION
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "VERSION = 4" >/dev/null 2>&1; then
+  :
+else
+  PBX_HDLC=0
+fi
+rm -f conftest*
+
+fi
+
+if test "x${PBX_HDLC}" != "x1"; then
+   { echo "$as_me:$LINENO: GENERIC_HDLC_VERSION version 4 not found, disabling sethdlc." >&5
+echo "$as_me: GENERIC_HDLC_VERSION version 4 not found, disabling sethdlc." >&6;}
+fi
+
 if test "x${PBX_DAHDI}" != "x1"; then
    { echo "$as_me:$LINENO: ***" >&5
 echo "$as_me: ***" >&6;}
@@ -5201,6 +5304,7 @@ USB_INCLUDE!$USB_INCLUDE$ac_delim
 USB_DIR!$USB_DIR$ac_delim
 PBX_USB!$PBX_USB$ac_delim
 EGREP!$EGREP$ac_delim
+PBX_HDLC!$PBX_HDLC$ac_delim
 USE_SELINUX!$USE_SELINUX$ac_delim
 ASCIIDOC!$ASCIIDOC$ac_delim
 PPPD_VERSION!$PPPD_VERSION$ac_delim
@@ -5208,7 +5312,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index 450d5c1..23929f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,8 @@ AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h])
 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 @@ case "$with_ppp" in
 	;;
 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. *** ])
diff --git a/dahdi.xml b/dahdi.xml
index a5c6e51..f071f5d 100644
--- a/dahdi.xml
+++ b/dahdi.xml
@@ -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>