diff options
| author | Marc Schink <openocd-dev@marcschink.de> | 2016-07-24 13:06:33 +0200 |
|---|---|---|
| committer | Paul Fertser <fercerpav@gmail.com> | 2016-11-05 20:40:18 +0000 |
| commit | f60d42b0e2d7c1bde4f75cf5fcaeddf11d21f7ed (patch) | |
| tree | 968836a86c08dd5ab77fb00816198dd004621f22 | |
| parent | 84111194b8e39cd27cbeedfa876a775ffea7d1c5 (diff) | |
| download | riscv-openocd-f60d42b0e2d7c1bde4f75cf5fcaeddf11d21f7ed.zip riscv-openocd-f60d42b0e2d7c1bde4f75cf5fcaeddf11d21f7ed.tar.gz riscv-openocd-f60d42b0e2d7c1bde4f75cf5fcaeddf11d21f7ed.tar.bz2 | |
Fix autogen.sh invocation of libjaylink
Move autogen.sh invocation of libjaylink from the configure to the
bootstrap script because the configure script is included in tarball
releases but autotools are not required to be available on end-user
machines.
Thanks to Paul Fertser for spotting this.
Change-Id: I5489ae83885157a01803eed51a7328e47d67ea6d
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/3569
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
| -rwxr-xr-x | bootstrap | 7 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 7 insertions, 1 deletions
@@ -39,5 +39,12 @@ else git submodule update fi +if [ -x src/jtag/drivers/libjaylink/autogen.sh ]; then + ( + cd src/jtag/drivers/libjaylink + ./autogen.sh + ) +fi + echo "Bootstrap complete. Quick build instructions:" echo "./configure ...." diff --git a/configure.ac b/configure.ac index 1fcafe0..52b2e96 100644 --- a/configure.ac +++ b/configure.ac @@ -1186,7 +1186,6 @@ AM_CONDITIONAL([HLADAPTER], [test $enable_stlink != no -o $enable_ti_icdi != no] if test $enable_jlink != no; then if test $use_internal_libjaylink = yes; then if test -f "$srcdir/src/jtag/drivers/libjaylink/configure.ac"; then - ( cd $srcdir/src/jtag/drivers/libjaylink/ && ./autogen.sh ) AX_CONFIG_SUBDIR_OPTION([src/jtag/drivers/libjaylink], [--enable-subproject-build]) else |