X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=configure.ac;h=642fb2d4c6325cc859e14ab0e1f0c6715bf86aa4;hp=771e6917e24d381fd596b2c0f7e0591eb3489bee;hb=bb3793c9a4ccd232c4ee3ce0a36bf200589ca0bb;hpb=7da1f2bbbc883077dff15556dd37a4a384c4dd1f

diff --git a/configure.ac b/configure.ac
index 771e6917e2..642fb2d4c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,7 @@ AM_MAINTAINER_MODE
 AM_CONFIG_HEADER([config.h])
 AH_BOTTOM([
 #include <helper/system.h>
+#include <helper/types.h>
 #include <helper/replacements.h>
 ])
 
@@ -396,10 +397,6 @@ AC_ARG_ENABLE([amtjtagaccel],
   AS_HELP_STRING([--enable-amtjtagaccel], [Enable building the Amontec JTAG-Accelerator driver]),
   [build_amtjtagaccel=$enableval], [build_amtjtagaccel=no])
 
-AC_ARG_ENABLE([ecosboard],
-  AS_HELP_STRING([--enable-ecosboard], [Enable building support for eCos based JTAG debugger]),
-  [build_ecosboard=$enableval], [build_ecosboard=no])
-
 AC_ARG_ENABLE([zy1000_master],
   AS_HELP_STRING([--enable-zy1000-master], [Use ZY1000 JTAG master registers]),
   [build_zy1000_master=$enableval], [build_zy1000_master=no])
@@ -474,6 +471,18 @@ AC_ARG_ENABLE([buspirate],
   AS_HELP_STRING([--enable-buspirate], [Enable building support for the Buspirate]),
   [build_buspirate=$enableval], [build_buspirate=no])
 
+AC_ARG_ENABLE([stlink],
+  AS_HELP_STRING([--enable-stlink], [Enable building support for the ST-Link JTAG Programmer]),
+  [build_stlink=$enableval], [build_stlink=no])
+
+AC_ARG_ENABLE([osbdm],
+  AS_HELP_STRING([--enable-osbdm], [Enable building support for the OSBDM (JTAG only) Programmer]),
+  [build_osbdm=$enableval], [build_osbdm=no])
+
+AC_ARG_ENABLE([opendous],
+  AS_HELP_STRING([--enable-opendous], [Enable building support for the estick/opendous JTAG Programmer]),
+  [build_opendous=$enableval], [build_opendous=no])
+
 AC_ARG_ENABLE([minidriver_dummy],
   AS_HELP_STRING([--enable-minidriver-dummy], [Enable the dummy minidriver.]),
   [build_minidriver_dummy=$enableval], [build_minidriver_dummy=no])
@@ -624,12 +633,6 @@ else
   AC_DEFINE([BUILD_EP93XX], [0], [0 if you don't want ep93xx.])
 fi
 
-if test $build_ecosboard = yes; then
-  AC_DEFINE([BUILD_ECOSBOARD], [1], [1 if you want eCosBoard.])
-else
-  AC_DEFINE([BUILD_ECOSBOARD], [0], [0 if you don't want eCosBoard.])
-fi
-
 if test $build_zy1000 = yes; then
   AC_DEFINE([BUILD_ZY1000], [1], [1 if you want ZY1000.])
 else
@@ -773,6 +776,24 @@ else
   AC_DEFINE([BUILD_BUSPIRATE], [0], [0 if you don't want the Buspirate JTAG driver.])
 fi
 
+if test $build_stlink = yes; then
+  AC_DEFINE([BUILD_STLINK], [1], [1 if you want the ST-Link JTAG driver.])
+else
+  AC_DEFINE([BUILD_STLINK], [0], [0 if you don't want the ST-Link JTAG driver.])
+fi
+
+if test $build_osbdm = yes; then
+  AC_DEFINE([BUILD_OSBDM], [1], [1 if you want the OSBDM driver.])
+else
+  AC_DEFINE([BUILD_OSBDM], [0], [0 if you don't want the OSBDM driver.])
+fi
+
+if test $build_opendous = yes; then
+  AC_DEFINE([BUILD_OPENDOUS], [1], [1 if you want the estick/opendous JTAG driver.])
+else
+  AC_DEFINE([BUILD_OPENDOUS], [0], [0 if you don't want the estick/opendous JTAG driver.])
+fi
+
 if test "$use_internal_jimtcl" = yes; then
   if test -f "$srcdir/jimtcl/configure.ac"; then
     AX_CONFIG_SUBDIR_OPTION([jimtcl], [--disable-install-jim])
@@ -1059,7 +1080,9 @@ fi
 
 # Check for libusb1 ported drivers.
 build_usb_ng=no
-if test $build_jlink = yes; then
+if test $build_jlink = yes -o $build_stlink = yes -o $build_osbdm = yes -o \
+  $build_opendous = yes
+then
   build_usb_ng=yes
 fi
 
@@ -1068,7 +1091,7 @@ use_libusb0=no
 use_libusb1=no
 if test $build_usb = yes -o $build_usb_ng = yes; then
   if test $check_libusb0 = no -a $build_usb_ng = yes; then
-	AC_CHECK_HEADERS([libusb-1.0/libusb.h],
+	AC_CHECK_HEADER([libusb-1.0/libusb.h],
 			[AC_DEFINE(HAVE_LIBUSB1, 1, [Define if you have libusb-1.0]) check_libusb0=no use_libusb1=yes ],
 			[ check_libusb0=yes use_libusb1=no ])
   fi
@@ -1084,7 +1107,6 @@ AM_CONDITIONAL([PARPORT], [test $build_parport = yes])
 AM_CONDITIONAL([DUMMY], [test $build_dummy = yes])
 AM_CONDITIONAL([GIVEIO], [test x$parport_use_giveio = xyes])
 AM_CONDITIONAL([EP93XX], [test $build_ep93xx = yes])
-AM_CONDITIONAL([ECOSBOARD], [test $build_ecosboard = yes])
 AM_CONDITIONAL([ZY1000], [test $build_zy1000 = yes])
 AM_CONDITIONAL([ZY1000_MASTER], [test $build_zy1000_master = yes])
 AM_CONDITIONAL([IOUTIL], [test $build_ioutil = yes])
@@ -1107,6 +1129,9 @@ AM_CONDITIONAL([ULINK], [test $build_ulink = yes])
 AM_CONDITIONAL([ARMJTAGEW], [test $build_armjtagew = yes])
 AM_CONDITIONAL([REMOTE_BITBANG], [test $build_remote_bitbang = yes])
 AM_CONDITIONAL([BUSPIRATE], [test $build_buspirate = yes])
+AM_CONDITIONAL([STLINK], [test $build_stlink = yes])
+AM_CONDITIONAL([OSBDM], [test $build_osbdm = yes])
+AM_CONDITIONAL([OPENDOUS], [test $build_opendous = yes])
 AM_CONDITIONAL([USB], [test $build_usb = yes])
 AM_CONDITIONAL([USB_NG], [test $build_usb_ng = yes])
 AM_CONDITIONAL([USE_LIBUSB0], [test $use_libusb0 = yes])
@@ -1211,23 +1236,25 @@ else
   EXEEXT_FOR_BUILD=$EXEEXT
 fi
 AC_MSG_RESULT([$EXEEXT_FOR_BUILD])
-AC_SUBST(EXEEXT_FOR_BUILD)
-
-AC_OUTPUT(dnl
-    Makefile dnl
-    src/Makefile dnl
-    src/helper/Makefile dnl
-    src/jtag/Makefile dnl
-    src/jtag/drivers/Makefile dnl
-    src/transport/Makefile dnl
-    src/xsvf/Makefile dnl
-    src/svf/Makefile dnl
-    src/target/Makefile dnl
-    src/rtos/Makefile dnl
-    src/server/Makefile dnl
-    src/flash/Makefile dnl
-    src/flash/nor/Makefile dnl
-    src/flash/nand/Makefile dnl
-    src/pld/Makefile dnl
-    doc/Makefile dnl
-  )
+AC_SUBST([EXEEXT_FOR_BUILD])
+
+AC_CONFIG_FILES([
+  Makefile
+  src/Makefile
+  src/helper/Makefile
+  src/jtag/Makefile
+  src/jtag/drivers/Makefile
+  src/jtag/stlink/Makefile
+  src/transport/Makefile
+  src/xsvf/Makefile
+  src/svf/Makefile
+  src/target/Makefile
+  src/rtos/Makefile
+  src/server/Makefile
+  src/flash/Makefile
+  src/flash/nor/Makefile
+  src/flash/nand/Makefile
+  src/pld/Makefile
+  doc/Makefile
+])
+AC_OUTPUT