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 3b60fc6e5d1f5f2ce9a271ab679a331bdfd55690..ad5e7bdd21503a64b657eee9048e1a25023665bd 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -39,5 +39,12 @@ else
     git submodule update
 fi
 
     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 ...."
 echo "Bootstrap complete. Quick build instructions:"
 echo "./configure ...."

diff --git a/configure.ac b/configure.ac
index 1fcafe064e83235ea74f65d41061c8f554356fa2..52b2e964f7f40aee341d9c8712e37b744abee62e 100644 (file)
--- 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
 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
       AX_CONFIG_SUBDIR_OPTION([src/jtag/drivers/libjaylink],
                [--enable-subproject-build])
     else