qi-hardware/xburst-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/xburst-tools.git synced 2024-11-22 13:25:20 +02:00
Code

Adjusted configure.ac to search for libraries required for jzboot.

Browse Source
This commit is contained in:
Peter Zotov 2011-04-05 19:56:25 +04:00
parent 1eaeb7dd58
commit c26a0ce1da
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
configure.ac
View File

@ -46,11 +46,34 @@ exit -1 ])
AC_CHECK_LIB([gcc], [main]) AC_CHECK_LIB([gcc], [main])
AC_CHECK_LIB([m], [main]) AC_CHECK_LIB([m], [main])
AC_CHECK_LIB([usb], [main], [], [ AC_CHECK_LIB([usb], [main], [], [
echo "Error! You need to have libusb. \n" echo "Error! You need to have libusb-0.1. \n"
echo "Maybe run 'sudo apt-get install libusb-dev' under debian" echo "Maybe run 'sudo apt-get install libusb-dev' under debian"
exit -1 ]) 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 ])
LIBS="$LIBS $USB_LIBS" AC_ARG_WITH([readline],
[AS_HELP_STRING([--with-readline],
[support fancy command line editing @<:@default=check@:>@])],
[],
[with_readline=check])
READLINE_LIBS=
AS_IF([test "x$with_readline" != xno],
[AC_CHECK_LIB([readline], [main],
[AC_SUBST([READLINE_LIBS], ["-lreadline -lncurses"])
AC_DEFINE([HAVE_READLINE], [1],
[Define if you have libreadline])
],
[if test "x$with_readline" != xcheck; then
AC_MSG_FAILURE(
[--with-readline was given, but test for readline failed])
fi
], -lncurses)])
LIBS="$LIBS $USB_LIBS $READLINE_LIBS"
CFLAGS="$CFLAGS $USB_CFLAGS" CFLAGS="$CFLAGS $USB_CFLAGS"
# Checks for header files. # Checks for header files.
@ -70,5 +93,5 @@ AC_CHECK_FUNCS([memset strerror])
AC_CONFIG_FILES(Makefile \ AC_CONFIG_FILES(Makefile \
usbboot/Makefile usbboot/src/Makefile \ usbboot/Makefile usbboot/src/Makefile \
xbboot/Makefile xbboot/host-app/Makefile \ xbboot/Makefile xbboot/host-app/Makefile \
jzboot/Makefile) jzboot/Makefile jzboot/src/Makefile)
AC_OUTPUT AC_OUTPUT

2
jzboot

@ -1 +1 @@
Subproject commit ce7446fd4c4743a685aa1d85b852743874c034c3 Subproject commit 8b4338fc90376ed10d814f8ae2ca1a0a4436c049