diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-05-23 14:42:39 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-05-23 14:42:39 +0000 |
| commit | e027cd533ab52f09186f1bd4cd33e0f3aac0363c (patch) | |
| tree | 7692563118b2189112481c08b11db879d8d239b4 | |
| parent | 9288979fd4333f7afbd5a4838b678634f7d8a375 (diff) | |
get menuselect to run with the right selections
git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4338 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | build_tools/make_tree | 5 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | dahdi.xml | 25 |
4 files changed, 34 insertions, 11 deletions
@@ -632,7 +632,7 @@ menuselect: menuselect/menuselect menuselect-tree menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h config.status @CFLAGS="" $(MAKE) -C menuselect CC=$(HOSTCC) -menuselect-tree: zaptel.xml firmware/firmware.xml +menuselect-tree: dahdi.xml @echo "Generating input for menuselect ..." @build_tools/make_tree > $@ diff --git a/build_tools/make_tree b/build_tools/make_tree index 3ec5a6d..01af666 100755 --- a/build_tools/make_tree +++ b/build_tools/make_tree @@ -2,7 +2,6 @@ echo "<?xml version=\"1.0\"?>" echo -echo "<menu name=\"Zaptel Module Selection\">" -cat zaptel.xml -cat firmware/firmware.xml +echo "<menu name=\"DAHDI Tools Selection\">" +cat dahdi.xml echo "</menu>" diff --git a/configure.ac b/configure.ac index bda6cd0..0ffc2c3 100644 --- a/configure.ac +++ b/configure.ac @@ -2,16 +2,16 @@ AC_PREREQ(2.59) -m4_define([ZAP_VERSION], +m4_define([DAHDI_VERSION], m4_bpatsubst(m4_esyscmd([build_tools/make_version .]), [\([0-9.]*\)\(\w\|\W\)*], [\1])) -AC_INIT(zaptel, ZAP_VERSION, www.asterisk.org) +AC_INIT(zaptel, DAHDI_VERSION, www.asterisk.org) # check existence of the package -AC_CONFIG_SRCDIR([kernel/zaptel-base.c]) +AC_CONFIG_SRCDIR([dahdi_cfg.c]) -AC_COPYRIGHT("Zaptel") +AC_COPYRIGHT("dahdi-tools") AC_REVISION($Revision$) ac_default_prefix=/usr @@ -124,9 +124,8 @@ esac AC_SUBST(PPPD_VERSION) -AC_CONFIG_FILES([build_tools/menuselect-deps makeopts build_tools/make_firmware_object]) +AC_CONFIG_FILES([build_tools/menuselect-deps makeopts]) AC_OUTPUT -chmod a+x build_tools/make_firmware_object -AC_MSG_NOTICE(*** Zaptel build successfully configured ***) +AC_MSG_NOTICE(*** dahdi-tools build successfully configured ***) diff --git a/dahdi.xml b/dahdi.xml new file mode 100644 index 0000000..4856446 --- /dev/null +++ b/dahdi.xml @@ -0,0 +1,25 @@ +<category name="MENUSELECT_UTILS" displayname="Utilities"> + <member name="fxotune" remove_on_change="fxotune fxotune.o"> + </member> + <member name="fxstest" remove_on_change="fxstest fxstest.o"> + <defaultenabled>no</defaultenabled> + </member> + <member name="sethdlc" remove_on_change="sethdlc sethdlc.o"> + </member> + <member name="dahdi_cfg" remove_on_change="dahdi_cfg dahdi_cfg.o"> + </member> + <member name="dahdi_diag" remove_on_change="dahdi_diag dahdi_diag.o"> + <defaultenabled>no</defaultenabled> + </member> + <member name="dahdi_monitor" remove_on_change="dahdi_monitor dahdi_monitor.o"> + </member> + <member name="dahdi_scan" remove_on_change="dahdi_scan dahdi_scan.o"> + </member> + <member name="dahdi_speed" remove_on_change="dahdi_speed dahdi_speed.o"> + </member> + <member name="dahdi_test" remove_on_change="dahdi_test dahdi_test.o"> + </member> + <member name="dahdi_tool" remove_on_change="dahdi_tool dahdi_tool.o"> + <depend>libnewt</depend> + </member> +</category> |