Fix ULINK driver dependencies in configure.ac

Commit dd6274d (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 f684252. Change-Id: I6946f1fdc0e26bfc7bdcff27a721e05a05b464a5 Signed-off-by: Martin Schmölzer <[email protected]> Reviewed-on: http://openocd.zylin.com/1699 Tested-by: jenkins Reviewed-by: Spencer Oliver <[email protected]>
jnohlgard · Oct 21, 2013 · 504f79a · 504f79a
1 parent b68bc7d
commit 504f79a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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]]])
 
 #========================================