From: Andreas Fritiofson Date: Mon, 15 Feb 2016 22:52:39 +0000 (+0100) Subject: configure: Remove conflicting CMSIS_DAP conditional X-Git-Tag: v0.10.0-rc1~33 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e311b2f097eee38f9a05eae909b1bce64b58a8ba;p=openocd configure: Remove conflicting CMSIS_DAP conditional It's already defined by PROCESS_ADAPTERS. Change-Id: I3bbcb0f77c645e9c5a98c2d5069c178358d1516b Signed-off-by: Andreas Fritiofson Reviewed-on: http://openocd.zylin.com/3239 Tested-by: jenkins Reviewed-by: Paul Fertser --- diff --git a/configure.ac b/configure.ac index d43525eb..95d76c94 100644 --- a/configure.ac +++ b/configure.ac @@ -752,7 +752,6 @@ AM_CONDITIONAL([IS_MINGW], [test $is_mingw = yes]) AM_CONDITIONAL([IS_WIN32], [test $is_win32 = yes]) AM_CONDITIONAL([IS_DARWIN], [test $is_darwin = yes]) AM_CONDITIONAL([BITQ], [test $build_bitq = yes]) -AM_CONDITIONAL([CMSIS_DAP], [test $use_hidapi = yes]) AM_CONDITIONAL([USE_LIBFTDI], [test $use_libftdi = yes]) AM_CONDITIONAL([MINIDRIVER], [test $build_minidriver = yes])