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>

diff --git a/configure.ac b/configure.ac
index 9ac411044948b9e48dafa9ffe19d5fe3d0852889..5fa5a639d00912ca779f6604d4d961f0f071c9b6 100644 (file)
--- 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([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], [
 
 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([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"], [
 
 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 bad4153a9c9595f191e40bfc2c7ff2b2a5bb86cd..699917c35a7d55d11c30f5512b2e41f527c83037 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,7 +78,7 @@ libopenocd_la_LIBADD = \
        $(HIDAPI_LIBS) $(LIBUSB0_LIBS) $(LIBUSB1_LIBS)
 
 if !INTERNAL_LIBJAYLINK
        $(HIDAPI_LIBS) $(LIBUSB0_LIBS) $(LIBUSB1_LIBS)
 
 if !INTERNAL_LIBJAYLINK

-libopenocd_la_LIBADD += $(libjaylink_LIBS)
+libopenocd_la_LIBADD += $(LIBJAYLINK_LIBS)

 endif
 
 STARTUP_TCL_SRCS = \
 endif
 
 STARTUP_TCL_SRCS = \

diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index 1322c0f10e8fb48decc88c97422c8dc036e66327..a50c92746c0513065ee0e8d08156adfa3f3c2f4c 100644 (file)
--- 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_LIBADD += libjaylink_internal.la
 else
 DRIVERFILES += jlink.c

-libocdjtagdrivers_la_CPPFLAGS += $(libjaylink_CFLAGS)
+libocdjtagdrivers_la_CPPFLAGS += $(LIBJAYLINK_CFLAGS)

 endif
 endif
 
 endif
 endif