remote_bitbang: missed closing brace in macro REMOTE_BITBANG_RAISE_ERROR

[openocd] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0b337129b752e8c49f1c3b07f9bc9e8d4d63eca0..4d7b7d75ea7f22e876f8cead096f119e0962113b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -396,10 +396,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])
@@ -482,6 +478,10 @@ 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])
@@ -632,12 +632,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
@@ -782,15 +776,21 @@ else
 fi
 
 if test $build_stlink = yes; then
-  AC_DEFINE(BUILD_STLINK, 1, [1 if you want the ST-Link JTAG driver.])
+  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.])
+  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.])
+  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.])
+  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
@@ -1079,7 +1079,9 @@ fi
 
 # Check for libusb1 ported drivers.
 build_usb_ng=no
-if test $build_jlink = yes -o $build_stlink = yes -o $build_osbdm = 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
 
@@ -1104,7 +1106,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])
@@ -1129,6 +1130,7 @@ 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])