X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=configure.ac;h=a5abdfd3c0f40df626c1aa87dfbc38f2e2b56a17;hp=9d5c0a1f55e1e58150674dce4cfc7bdbe3c08740;hb=01298ca2c839965f54d6d6a7b8ac00fe77190116;hpb=accb8e94c341c0dba06ccf1e1ee97eaf81065e3c

diff --git a/configure.ac b/configure.ac
index 9d5c0a1f55..a5abdfd3c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ(2.60)
+AC_PREREQ(2.64)
 AC_INIT([openocd], [0.8.0-dev],
   [OpenOCD Mailing List <openocd-devel@lists.sourceforge.net>])
 AC_CONFIG_SRCDIR([src/openocd.c])
@@ -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]]])
 
 #========================================
@@ -908,7 +908,7 @@ if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes -o $build_usb_b
       ])
     AC_SEARCH_LIBS([FT_GetLibraryVersion],[ftd2xx],,[
         AC_MSG_ERROR([You appear to be missing the FTD2xx driver library.])
-      ],[])
+      ],[-lrt -lusb-1.0])
   fi
 fi
 fi # linux
@@ -1261,6 +1261,7 @@ AC_CONFIG_FILES([
   src/jtag/hla/Makefile
   src/jtag/aice/Makefile
   src/transport/Makefile
+  src/target/openrisc/Makefile
   src/xsvf/Makefile
   src/svf/Makefile
   src/target/Makefile