[svn-commits] tzafrir: branch tzafrir/xpp_1.2 r1554 - in /team/tzafrir/xpp_1.2: ./ xpp/utils/

[svn-commits at lists.digium.com]

Author: tzafrir
Date: Sat Nov  4 16:36:12 2006
New Revision: 1554

URL: http://svn.digium.com/view/zaptel?rev=1554&view=rev
Log:
Get xpp/utils configuration from autoconf (based on rev 1435)

Modified:
    team/tzafrir/xpp_1.2/configure.ac
    team/tzafrir/xpp_1.2/makeopts.in
    team/tzafrir/xpp_1.2/xpp/utils/Makefile

Modified: team/tzafrir/xpp_1.2/configure.ac
URL: http://svn.digium.com/view/zaptel/team/tzafrir/xpp_1.2/configure.ac?rev=1554&r1=1553&r2=1554&view=diff
==============================================================================
--- team/tzafrir/xpp_1.2/configure.ac (original)
+++ team/tzafrir/xpp_1.2/configure.ac Sat Nov  4 16:36:12 2006
@@ -49,6 +49,7 @@
 AST_EXT_LIB([curses], [initscr], [curses.h], [CURSES], [curses], [])
 AST_EXT_LIB([ncurses], [initscr], [curses.h], [NCURSES], [ncurses], [])
 AST_EXT_LIB([newt], [newtBell], [newt.h], [NEWT], [newt])
+AST_EXT_LIB([usb], [usb_init], [usb.h], [USB], [libusb])
 
 AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
 AC_OUTPUT

Modified: team/tzafrir/xpp_1.2/makeopts.in
URL: http://svn.digium.com/view/zaptel/team/tzafrir/xpp_1.2/makeopts.in?rev=1554&r1=1553&r2=1554&view=diff
==============================================================================
--- team/tzafrir/xpp_1.2/makeopts.in (original)
+++ team/tzafrir/xpp_1.2/makeopts.in Sat Nov  4 16:36:12 2006
@@ -31,3 +31,7 @@
 NCURSES_LIB=@NCURSES_LIB@
 NCURSES_INCLUDE=@NCURSES_INCLUDE@
 
+PBX_LIBUSB=@PBX_LIBUSB@
+USB_LIB=@NCURSES_LIB@
+USB_INCLUDE=@USB_INCLUDE@
+

Modified: team/tzafrir/xpp_1.2/xpp/utils/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/xpp_1.2/xpp/utils/Makefile?rev=1554&r1=1553&r2=1554&view=diff
==============================================================================
--- team/tzafrir/xpp_1.2/xpp/utils/Makefile (original)
+++ team/tzafrir/xpp_1.2/xpp/utils/Makefile Sat Nov  4 16:36:12 2006
@@ -1,12 +1,16 @@
 PEDANTIC	= -ansi -pedantic -std=c99
 
 RANLIB		= ranlib
-INSTALL		= install
-INSTALL_DATA	= install -m 644
 
-BINDIR    = /usr/sbin
-DATADIR   = /usr/share/zaptel
-MANDIR    = /usr/share/man/man8
+TOPDIR		?= ../..
+
+-include $(TOPDIR)/makeopts
+
+INSTALL_DATA	= $(INSTALL) -m 644
+
+SBINDIR   = $(prefix)/sbin
+DATADIR   = $(datadir)/zaptel
+MANDIR    = $(mandir)/man8
 HOTPLUG_USB_DIR = /etc/hotplug/usb
 
 XPD_FIRMWARE	= $(wildcard ../firmwares/*.hex)
@@ -16,8 +20,8 @@
 # Variables that should be defined above, but need sane defaults:
 # FIXME: Are those values really sane?
 HOSTCC		?= $(CC)
-CONFIG_USB	?= y
-DRIVER_DIR	?= ../..
+PBX_LIBUSB	?= 1
+DRIVER_DIR	?= $(TOPDIR)
 
 WCTDM=$(DRIVER_DIR)/wctdm.c
 
@@ -26,7 +30,7 @@
 TARGETS	= init_fxo_modes print_modes adj_clock
 PROG_INSTALL	= genzaptelconf adj_clock
 MAN_INSTALL	= genzaptelconf.8 adj_clock.8
-ifneq	(,$(filter y m,$(CONFIG_USB)))
+ifeq	($(PBX_LIBUSB),1)
 TARGETS	+= libhexfile.a fpga_load test_parse
 PROG_INSTALL	+= fpga_load
 MAN_INSTALL	+= fpga_load.8