* configure.ac (AC_CHECK_LIB([usb]): implement a private LIBUSB

macro to add this library to, to prevent it from being
automatically linked to all binaries.  This should fix the Win32
build of loaddrv.
* Makefile.am (avrdude_LDADD): add LIBUSB here.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@602 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
joerg_wunsch 2006-08-11 16:00:12 +00:00
parent bad9959d3f
commit e04281104f
3 changed files with 14 additions and 1 deletions

View File

@ -1,3 +1,11 @@
2006-08-11 Joerg Wunsch <j@uriah.heep.sax.de>
* configure.ac (AC_CHECK_LIB([usb]): implement a private LIBUSB
macro to add this library to, to prevent it from being
automatically linked to all binaries. This should fix the Win32
build of loaddrv.
* Makefile.am (avrdude_LDADD): add LIBUSB here.
2006-08-10 Eric B. Weddington <eweddington@cso.atmel.com> 2006-08-10 Eric B. Weddington <eweddington@cso.atmel.com>
Contributed by Bob Paddock <graceindustries@gmail.com> Contributed by Bob Paddock <graceindustries@gmail.com>

View File

@ -47,6 +47,8 @@ avrdude_CPPFLAGS = -DCONFIG_DIR=\"$(sysconfdir)\"
avrdude_CFLAGS = @ENABLE_WARNINGS@ avrdude_CFLAGS = @ENABLE_WARNINGS@
avrdude_LDADD = @LIBUSB@
bin_PROGRAMS = avrdude bin_PROGRAMS = avrdude
avrdude_SOURCES = \ avrdude_SOURCES = \

View File

@ -46,7 +46,10 @@ AC_CHECK_LIB([ncurses], [tputs])
AC_CHECK_LIB([readline], [readline]) AC_CHECK_LIB([readline], [readline])
# usb_get_string_simple is only available in recent enough # usb_get_string_simple is only available in recent enough
# versions of libusb, so use that as a decision base. # versions of libusb, so use that as a decision base.
AC_CHECK_LIB([usb], [usb_get_string_simple]) AC_CHECK_LIB([usb], [usb_get_string_simple],
[LIBUSB=-lusb],
[LIBUSB=])
AC_SUBST(LIBUSB, $LIBUSB)
# Checks for header files. # Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC