From 554c72cab4502fa3114d5e341cc10996f119a253 Mon Sep 17 00:00:00 2001 From: joerg_wunsch Date: Wed, 20 Apr 2016 20:40:58 +0000 Subject: [PATCH] * configure.ac (libftdi1): Rather than hardcoding the library providing the libusb-1.0 API, use the result from the previous probe. This helps detecting libftdi1 on FreeBSD where the libusb-1.0 API is provided by the system's libusb. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1390 81a1dc3b-b13d-400b-aceb-764788c761c2 --- ChangeLog | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0cba4da4..3539313e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-04-20 Joerg Wunsch + + * configure.ac (libftdi1): Rather than hardcoding the library + providing the libusb-1.0 API, use the result from the previous + probe. This helps detecting libftdi1 on FreeBSD where the + libusb-1.0 API is provided by the system's libusb. + 2016-04-18 Joerg Wunsch * usb_hidapi.c (usbhid_open): Correctly calculate the diff --git a/configure.ac b/configure.ac index 8194123a..a23a959f 100644 --- a/configure.ac +++ b/configure.ac @@ -175,7 +175,7 @@ AH_TEMPLATE([HAVE_LIBFTDI], [Define if FTDI support is enabled via libftdi]) AH_TEMPLATE([HAVE_LIBFTDI_TYPE_232H], [Define if libftdi supports FT232H, libftdi version >= 0.20]) -AC_CHECK_LIB([ftdi1], [ftdi_new], [have_libftdi1=yes], [], [-lusb-1.0]) +AC_CHECK_LIB([ftdi1], [ftdi_new], [have_libftdi1=yes], [], [$LIBUSB_1_0]) AC_CHECK_LIB([ftdi], [ftdi_usb_get_strings], [have_libftdi=yes], [], [-lusb]) if test x$have_libftdi1 = xyes; then LIBFTDI1="-lftdi1"