diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | build_tools/menuselect-deps.in | 2 | ||||
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | makeopts.in | 6 |
5 files changed, 13 insertions, 10 deletions
@@ -45,6 +45,7 @@ ROOT_PREFIX= 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) diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in index 1c26316..2f61b24 100644 --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in @@ -1 +1 @@ -LIBNEWT=@PBX_LIBNEWT@ +LIBNEWT=@PBX_NEWT@ @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 4342 . +# From configure.ac Revision: 4361 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -4722,14 +4722,14 @@ if test "x${PBX_USB}" != "x1" -a "${USE_USB}" != "no"; then if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_USB_FOUND=yes else - as_ac_Lib=`echo "ac_cv_lib_libusb_${pbxfuncname}" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -llibusb" >&5 -echo $ECHO_N "checking for ${pbxfuncname} in -llibusb... $ECHO_C" >&6; } + as_ac_Lib=`echo "ac_cv_lib_usb_${pbxfuncname}" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lusb" >&5 +echo $ECHO_N "checking for ${pbxfuncname} in -lusb... $ECHO_C" >&6; } if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-llibusb ${pbxlibdir} $LIBS" +LIBS="-lusb ${pbxlibdir} $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4795,7 +4795,7 @@ fi # now check for the header. if test "${AST_USB_FOUND}" = "yes"; then - USB_LIB="${pbxlibdir} -llibusb " + USB_LIB="${pbxlibdir} -lusb " # if --with-USB=DIR has been specified, use it. if test "x${USB_DIR}" != "x"; then USB_INCLUDE="-I${USB_DIR}/include" diff --git a/configure.ac b/configure.ac index 1ac41e6..7f34405 100644 --- a/configure.ac +++ b/configure.ac @@ -73,7 +73,7 @@ AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h]) 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], diff --git a/makeopts.in b/makeopts.in index c2bf075..08befb1 100644 --- a/makeopts.in +++ b/makeopts.in @@ -26,7 +26,7 @@ sysconfdir = @sysconfdir@ DOWNLOAD=@DOWNLOAD@ -PBX_LIBNEWT=@PBX_LIBNEWT@ +PBX_NEWT=@PBX_NEWT@ NEWT_LIB=@NEWT_LIB@ NEWT_INCLUDE=@NEWT_INCLUDE@ @@ -36,10 +36,12 @@ CURSES_INCLUDE=@CURSES_INCLUDE@ 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@ PPPD_VERSION=@PPPD_VERSION@ |