[svn-commits] tzafrir: tools/trunk r8266 - in /tools/trunk: configure configure.ac

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Sun Mar  7 08:46:33 2010
New Revision: 8266

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8266
Log:
dahdi-tools 2.3 requires dahdi-linux 2.3

If you try building dahdi-tools vs. older dahdi-linux headers, dahdi_cfg
fails to build due to missing DAHDI_CONFIG_TERN and DAHDI_CONFIG_NTTE.

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

Modified: tools/trunk/configure.ac
URL: http://svnview.digium.com/svn/dahdi/tools/trunk/configure.ac?view=diff&rev=8266&r1=8265&r2=8266
==============================================================================
--- tools/trunk/configure.ac (original)
+++ tools/trunk/configure.ac Sun Mar  7 08:46:33 2010
@@ -94,6 +94,8 @@
 AST_EXT_LIB_SETUP([USB], [usb], [usb])
 
 AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h])
+DAHDI23_DIR="${DAHDI_DIR}"
+AST_C_DEFINE_CHECK([DAHDI23], [DAHDI_CONFIG_NTTE], [dahdi/user.h])
 AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
 AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h])
 
@@ -197,6 +199,14 @@
    exit 1
 fi
 
+if test "x${PBX_DAHDI23}" != "x1"; then
+   AC_MSG_NOTICE([***])
+   AC_MSG_NOTICE([*** Building this package requires DAHDI support (>= 2.3) *** ])
+   AC_MSG_NOTICE([*** Please install a recent dahdi-linux package. ***])
+   AC_MSG_NOTICE([***])
+   exit 1
+fi
+
 AC_SUBST(PPPD_VERSION)
 
 AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])