[svn-commits] tzafrir: tools/trunk r4369 - in /tools/trunk: ./ build_tools/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Tue Jun 17 11:37:45 2008
New Revision: 4369

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4369
Log:
* Fix names of libraries: dahdi_tool builds.
* Honor --with-dahdi=custom/path

Modified:
    tools/trunk/Makefile
    tools/trunk/build_tools/menuselect-deps.in
    tools/trunk/configure
    tools/trunk/configure.ac
    tools/trunk/makeopts.in

Modified: tools/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/tools/trunk/Makefile?view=diff&rev=4369&r1=4368&r2=4369
==============================================================================
--- tools/trunk/Makefile (original)
+++ tools/trunk/Makefile Tue Jun 17 11:37:45 2008
@@ -45,6 +45,7 @@
 
 CONFIG_FILE=/etc/dahdi.conf
 CFLAGS+=-DDAHDI_CONFIG=\"$(CONFIG_FILE)\"
+CFLAGS+=$(DAHDI_INCLUDE)
 
 CHKCONFIG	:= $(wildcard /sbin/chkconfig)
 UPDATE_RCD	:= $(wildcard /usr/sbin/update-rc.d)

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=4369&r1=4368&r2=4369
==============================================================================
--- tools/trunk/build_tools/menuselect-deps.in (original)
+++ tools/trunk/build_tools/menuselect-deps.in Tue Jun 17 11:37:45 2008
@@ -1,1 +1,1 @@
-LIBNEWT=@PBX_LIBNEWT@
+LIBNEWT=@PBX_NEWT@

Modified: tools/trunk/configure.ac
URL: http://svn.digium.com/view/dahdi/tools/trunk/configure.ac?view=diff&rev=4369&r1=4368&r2=4369
==============================================================================
--- tools/trunk/configure.ac (original)
+++ tools/trunk/configure.ac Tue Jun 17 11:37:45 2008
@@ -73,7 +73,7 @@
 AST_C_DEFINE_CHECK([DAHDI], [DAHDI_CODE], [dahdi/user.h])
 AST_EXT_LIB_CHECK([NCURSES], [ncurses], [initscr], [curses.h])
 AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
-AST_EXT_LIB_CHECK([USB], [libusb], [usb_init], [usb.h])
+AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h])
 
 AC_ARG_WITH(selinux,
 	[AS_HELP_STRING([--with-selinux],

Modified: tools/trunk/makeopts.in
URL: http://svn.digium.com/view/dahdi/tools/trunk/makeopts.in?view=diff&rev=4369&r1=4368&r2=4369
==============================================================================
--- tools/trunk/makeopts.in (original)
+++ tools/trunk/makeopts.in Tue Jun 17 11:37:45 2008
@@ -26,7 +26,7 @@
 
 DOWNLOAD=@DOWNLOAD@
 
-PBX_LIBNEWT=@PBX_LIBNEWT@
+PBX_NEWT=@PBX_NEWT@
 NEWT_LIB=@NEWT_LIB@
 NEWT_INCLUDE=@NEWT_INCLUDE@
 
@@ -36,9 +36,11 @@
 NCURSES_LIB=@NCURSES_LIB@
 NCURSES_INCLUDE=@NCURSES_INCLUDE@
 
-PBX_LIBUSB=@PBX_LIBUSB@
+PBX_USB=@PBX_USB@
 USB_LIB=@USB_LIB@
 USB_INCLUDE=@USB_INCLUDE@
+
+DAHDI_INCLUDE=@DAHDI_INCLUDE@
 
 USE_SELINUX=@USE_SELINUX@