Browse Source

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>
tags/v0.10.0-rc1
Marc Schink Paul Fertser 3 years ago
parent
commit
f60d42b0e2
2 changed files with 7 additions and 1 deletions
  1. +7
    -0
      bootstrap
  2. +0
    -1
      configure.ac

+ 7
- 0
bootstrap View File

@@ -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 ...."

+ 0
- 1
configure.ac View File

@@ -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


Loading…
Cancel
Save