diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2012-10-04 14:01:14 +0100 |
|---|---|---|
| committer | Peter Stuge <peter@stuge.se> | 2012-10-04 13:42:56 +0000 |
| commit | bd5f5c6a66f04751a4752ede396b4a12f478ee25 (patch) | |
| tree | 7c5653b01e671c5be419086be156ae667695facf /configure.ac | |
| parent | c9d9573c2962777a2174bd3c4cc918e38cb2d20c (diff) | |
| download | riscv-openocd-bd5f5c6a66f04751a4752ede396b4a12f478ee25.zip riscv-openocd-bd5f5c6a66f04751a4752ede396b4a12f478ee25.tar.gz riscv-openocd-bd5f5c6a66f04751a4752ede396b4a12f478ee25.tar.bz2 | |
build: fix broken ftd2xx bus blaster
If configure is executed without --enable-ft2232_ftd2xx then the bus blaster
or presto will fail to build with unresolved external ftd2xx_status_string.
Make sure we run the ftd2xx build test if --enable-usb_blaster_ftd2xx is enabled.
Change-Id: I09d270d6fcd083d77f6785b8969d9acb3dfef11d
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/892
Tested-by: jenkins
Reviewed-by: Peter Stuge <peter@stuge.se>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 3665f03..d61dcc1 100644 --- a/configure.ac +++ b/configure.ac @@ -886,7 +886,7 @@ then AC_MSG_ERROR([The option: with_ftd2xx_linux_tardir is for LINUX only.]) fi -if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes ; then +if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes -o $build_usb_blaster_ftd2xx = yes ; then AC_MSG_CHECKING([for libftd2xx.a (darwin)]) if test ! -f /usr/local/include/ftd2xx.h ; then @@ -907,7 +907,7 @@ then AC_MSG_ERROR([The option: --with-ftd2xx-win32-zipdir is for win32 only]) fi -if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes ; then +if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes -o $build_usb_blaster_ftd2xx = yes ; then # Must be linux if test $host_os != linux-gnu && test $host_os != linux ; then AC_MSG_ERROR([The (linux) ftd2xx library from FTDICHIP.com is linux only. Try --enable-ft2232-libftdi instead]) @@ -970,7 +970,7 @@ if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes ; then fi fi # linux -if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes; then +if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes -o $build_usb_blaster_ftd2xx = yes ; then # Before we go any further - make sure we can *BUILD* and *RUN* # a simple app with the "ftd2xx.lib" file - in what ever form we where given |