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 | |
| parent | 702b150a6bf92fe56cf0cea72ccfad2d06eb64bc (diff) | |
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>
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/jtag/drivers/Makefile.am | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 9ac41104..5fa5a639 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"], [ diff --git a/src/Makefile.am b/src/Makefile.am index bad4153a..699917c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -78,7 +78,7 @@ libopenocd_la_LIBADD = \ $(HIDAPI_LIBS) $(LIBUSB0_LIBS) $(LIBUSB1_LIBS) if !INTERNAL_LIBJAYLINK -libopenocd_la_LIBADD += $(libjaylink_LIBS) +libopenocd_la_LIBADD += $(LIBJAYLINK_LIBS) endif STARTUP_TCL_SRCS = \ diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am index 1322c0f1..a50c9274 100644 --- a/src/jtag/drivers/Makefile.am +++ b/src/jtag/drivers/Makefile.am @@ -33,7 +33,7 @@ noinst_LTLIBRARIES += libjaylink_internal.la libocdjtagdrivers_la_LIBADD += libjaylink_internal.la else DRIVERFILES += jlink.c -libocdjtagdrivers_la_CPPFLAGS += $(libjaylink_CFLAGS) +libocdjtagdrivers_la_CPPFLAGS += $(LIBJAYLINK_CFLAGS) endif endif |