qi-hardware/xburst-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/xburst-tools.git synced 2024-11-01 06:24:04 +02:00
Code

Use pkg-config to detect libusb-1.0.

Browse Source
This commit is contained in:
Peter Zotov 2011-04-07 14:13:10 +04:00
parent c26a0ce1da
commit fdbf94c903
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -49,10 +49,7 @@ AC_CHECK_LIB([usb], [main], [], [
echo "Error! You need to have libusb-0.1. \n"
echo "Maybe run 'sudo apt-get install libusb-dev' under debian"
exit -1 ])
AC_CHECK_LIB([usb-1.0], [main], [], [
echo "Error! You need to have libusb-1.0. \n"
echo "Maybe run 'sudo apt-get install libusb1.0-0-dev' under debian"
exit -1 ])
PKG_CHECK_MODULES([LIBUSB1], [libusb-1.0])
AC_ARG_WITH([readline],
[AS_HELP_STRING([--with-readline],
@ -73,8 +70,8 @@ AS_IF([test "x$with_readline" != xno],
fi
], -lncurses)])
LIBS="$LIBS $USB_LIBS $READLINE_LIBS"
CFLAGS="$CFLAGS $USB_CFLAGS"
LIBS="$LIBS $USB_LIBS $READLINE_LIBS $LIBUSB1_LIBS"
CFLAGS="$CFLAGS $USB_CFLAGS $LIBUSB1_CFLAGS"
# Checks for header files.
AC_HEADER_STDC

2
jzboot

@ -1 +1 @@
Subproject commit 8b4338fc90376ed10d814f8ae2ca1a0a4436c049
Subproject commit 04ed523633082c0bc49fd23f8424bdf1523b1ec4