Fix autogen.sh invocation of libjaylink 69/3569/3
authorMarc Schink <openocd-dev@marcschink.de>
Sun, 24 Jul 2016 11:06:33 +0000 (13:06 +0200)
committerPaul Fertser <fercerpav@gmail.com>
Sat, 5 Nov 2016 20:40:18 +0000 (20:40 +0000)
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>
bootstrap
configure.ac

index 3b60fc6..ad5e7bd 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -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 ...."
index 1fcafe0..52b2e96 100644 (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