diff options
| author | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2016-11-06 12:48:02 +0100 |
|---|---|---|
| committer | Paul Fertser <fercerpav@gmail.com> | 2016-12-08 15:09:18 +0000 |
| commit | 95de342a93445faa99b32d8dfecc947e3a5b49cb (patch) | |
| tree | 8d794b59173842b68a0a0060333388aab78e2a4d /configure.ac | |
| parent | 702b150a6bf92fe56cf0cea72ccfad2d06eb64bc (diff) | |
| download | riscv-openocd-95de342a93445faa99b32d8dfecc947e3a5b49cb.zip riscv-openocd-95de342a93445faa99b32d8dfecc947e3a5b49cb.tar.gz riscv-openocd-95de342a93445faa99b32d8dfecc947e3a5b49cb.tar.bz2 | |
configure: Use same case for libjaylink as for other libs
Change-Id: I60d91a0543d9b8c580254cdc5f04b2e60209b98b
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/3868
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 9ac4110..5fa5a63 100644 --- a/configure.ac +++ b/configure.ac @@ -644,8 +644,8 @@ PKG_CHECK_MODULES([LIBFTDI], [libftdi1], [use_libftdi=yes], [ PKG_CHECK_MODULES([LIBFTDI], [libftdi], [use_libftdi=yes], [use_libftdi=no]) ]) -PKG_CHECK_MODULES([libjaylink], [libjaylink >= 0.1], - [HAVE_LIBJAYLINK=yes], [HAVE_LIBJAYLINK=no]) +PKG_CHECK_MODULES([LIBJAYLINK], [libjaylink >= 0.1], + [use_libjaylink=yes], [use_libjaylink=no]) m4_define([PROCESS_ADAPTERS], [ m4_foreach([adapter], [$1], [ @@ -670,7 +670,7 @@ PROCESS_ADAPTERS([USB_ADAPTERS], ["x$use_libusb1" = "xyes" -o "x$use_libusb0" = PROCESS_ADAPTERS([USB0_ADAPTERS], ["x$use_libusb0" = "xyes"], [libusb-0.1]) PROCESS_ADAPTERS([HIDAPI_ADAPTERS], ["x$use_hidapi" = "xyes"], [hidapi]) PROCESS_ADAPTERS([LIBFTDI_ADAPTERS], ["x$use_libftdi" = "xyes"], [libftdi]) -PROCESS_ADAPTERS([LIBJAYLINK_ADAPTERS], ["x$use_libusb1" = "xyes" -a "x$use_internal_libjaylink" = "xyes" -o "x$HAVE_LIBJAYLINK" = "xyes"], [libusb-1.x or libjaylink-0.1]) +PROCESS_ADAPTERS([LIBJAYLINK_ADAPTERS], ["x$use_libusb1" = "xyes" -a "x$use_internal_libjaylink" = "xyes" -o "x$use_libjaylink" = "xyes"], [libusb-1.x or libjaylink-0.1]) AS_IF([test "x$build_openjtag" = "xyes"], [ AS_IF([test "x$use_libusb1" != "xyes" -a "x$use_libusb0" != "xyes"], [ |