Fix ULINK driver dependencies in configure.ac

Commit dd6274deed65c47ba2ef46e14259167d393399d8 (see
http://openocd.zylin.com/#/c/1475/ for futher information) adds the wrong
libusb dependency for the ULINK driver (libusb-0.1), when in fact the ULINK
driver uses the libusb-1.0 API since commit
f684252b2530d86f3a8330940105b86c770231f1.

Change-Id: I6946f1fdc0e26bfc7bdcff27a721e05a05b464a5
Signed-off-by: Martin Schmölzer <martin.schmoelzer@student.tuwien.ac.at>
Reviewed-on: http://openocd.zylin.com/1699
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>

diff --git a/configure.ac b/configure.ac
index b713a30721bd7aa0df52a445c9c8ee67438aba7e..a5abdfd3c0f40df626c1aa87dfbc38f2e2b56a17 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -194,7 +194,8 @@ m4_define([ADAPTER_OPT], [m4_translit(ADAPTER_ARG($1), [_], [-])])
 m4_define([USB1_ADAPTERS],
        [[[ftdi], [MPSSE mode of FTDI based devices], [FTDI]],
        [[stlink], [ST-Link JTAG Programmer], [HLADAPTER_STLINK]],
-       [[ti_icdi], [TI ICDI JTAG Programmer], [HLADAPTER_ICDI]]])
+       [[ti_icdi], [TI ICDI JTAG Programmer], [HLADAPTER_ICDI]],
+       [[ulink], [Keil ULINK JTAG Programmer], [ULINK]]])
 
 m4_define([USB_ADAPTERS],
        [[[jlink], [Segger J-Link JTAG Programmer], [JLINK]],
@@ -206,7 +207,6 @@ m4_define([USB0_ADAPTERS],
        [[[vsllink], [Versaloon-Link JTAG Programmer], [VSLLINK]],
        [[usbprog], [USBProg JTAG Programmer], [USBPROG]],
        [[rlink], [Raisonance RLink JTAG Programmer], [RLINK]],
-       [[ulink], [Keil ULINK JTAG Programmer], [ULINK]],
        [[armjtagew], [Olimex ARM-JTAG-EW Programmer], [ARMJTAGEW]]])
 
 #========================================