From: Marc Schink <openocd-dev@marcschink.de>
Date: Sun, 24 Jul 2016 11:06:33 +0000 (+0200)
Subject: Fix autogen.sh invocation of libjaylink
X-Git-Tag: v0.10.0-rc1~58
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=f60d42b0e2d7c1bde4f75cf5fcaeddf11d21f7ed

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

diff --git a/bootstrap b/bootstrap
index 3b60fc6e5d..ad5e7bdd21 100755
--- 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 ...."
diff --git a/configure.ac b/configure.ac
index 1fcafe064e..52b2e964f7 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