Skip to content

Commit f60d42b

Browse files
Marc Schinkpaulfertser
authored andcommitted
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 <[email protected]> Reviewed-on: http://openocd.zylin.com/3569 Tested-by: jenkins Reviewed-by: Paul Fertser <[email protected]>
1 parent 8411119 commit f60d42b

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

bootstrap

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,12 @@ else
3939
git submodule update
4040
fi
4141

42+
if [ -x src/jtag/drivers/libjaylink/autogen.sh ]; then
43+
(
44+
cd src/jtag/drivers/libjaylink
45+
./autogen.sh
46+
)
47+
fi
48+
4249
echo "Bootstrap complete. Quick build instructions:"
4350
echo "./configure ...."

configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1186,7 +1186,6 @@ AM_CONDITIONAL([HLADAPTER], [test $enable_stlink != no -o $enable_ti_icdi != no]
11861186
if test $enable_jlink != no; then
11871187
if test $use_internal_libjaylink = yes; then
11881188
if test -f "$srcdir/src/jtag/drivers/libjaylink/configure.ac"; then
1189-
( cd $srcdir/src/jtag/drivers/libjaylink/ && ./autogen.sh )
11901189
AX_CONFIG_SUBDIR_OPTION([src/jtag/drivers/libjaylink],
11911190
[--enable-subproject-build])
11921191
else

0 commit comments

Comments
 (0)