diff options
| author | Tim Newsome <tim@sifive.com> | 2021-08-30 15:03:59 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2021-08-30 15:03:59 -0700 |
| commit | a1146731a8a26207815b7540d2a26c52d67514c1 (patch) | |
| tree | 3e31558613f44bb910c3245b8e60886414e6a22b /configure.ac | |
| parent | 13cfec45ccca35b3eb59631162147688c0127f8e (diff) | |
| parent | 9a9e9e2c666dcb4987421f89d3b09ff9951cb0a1 (diff) | |
| download | riscv-openocd-a1146731a8a26207815b7540d2a26c52d67514c1.zip riscv-openocd-a1146731a8a26207815b7540d2a26c52d67514c1.tar.gz riscv-openocd-a1146731a8a26207815b7540d2a26c52d67514c1.tar.bz2 | |
Merge branch 'master' into from_upstream
Conflicts:
src/flash/nor/fespi.c
src/jtag/drivers/ftdi.c
src/rtos/FreeRTOS.c
src/rtos/hwthread.c
src/rtos/rtos.c
src/rtos/rtos.h
src/rtos/rtos_ecos_stackings.c
src/rtos/rtos_embkernel_stackings.c
src/rtos/rtos_standard_stackings.c
src/rtos/rtos_standard_stackings.h
src/rtos/rtos_ucos_iii_stackings.c
src/server/gdb_server.c
src/server/server.c
src/target/riscv/riscv-013.c
src/target/target.c
src/target/target.h
Change-Id: If0924a3e799260c33fae5feb85975b1273b45a0f
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 46bd269..f969680 100644 --- a/configure.ac +++ b/configure.ac @@ -571,9 +571,6 @@ AS_IF([test "x$build_xlnx_pcie_xvc" = "xyes"], [ PKG_CHECK_MODULES([LIBUSB1], [libusb-1.0], [ use_libusb1=yes AC_DEFINE([HAVE_LIBUSB1], [1], [Define if you have libusb-1.x]) - PKG_CHECK_EXISTS([libusb-1.0 >= 1.0.9], - [AC_DEFINE([HAVE_LIBUSB_ERROR_NAME], [1], [Define if your libusb has libusb_error_name()])], - [AC_MSG_WARN([libusb-1.x older than 1.0.9 detected, consider updating])]) LIBUSB1_CFLAGS=`echo $LIBUSB1_CFLAGS | sed 's/-I/-isystem /'` AC_MSG_NOTICE([libusb-1.0 header bug workaround: LIBUSB1_CFLAGS changed to "$LIBUSB1_CFLAGS"]) PKG_CHECK_EXISTS([libusb-1.0 >= 1.0.16], |