From 1b8512271fde42b4a7d83c0c3eea9e97e3fd9f35 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Tue, 7 Jul 2020 16:08:14 -0400 Subject: Update cryptest-autotools.sh script --- TestScripts/cryptest-autotools.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/TestScripts/cryptest-autotools.sh b/TestScripts/cryptest-autotools.sh index 9ab6d49f..7aa5bc5b 100755 --- a/TestScripts/cryptest-autotools.sh +++ b/TestScripts/cryptest-autotools.sh @@ -39,13 +39,13 @@ fi # Fixup for missing libtool if [[ ! -z $(command -v libtoolize) ]]; then - LIBTOOLIZE=$(command -v libtoolize) + export LIBTOOLIZE=$(command -v libtoolize) elif [[ ! -z $(command -v glibtoolize) ]]; then - LIBTOOLIZE=$(command -v glibtoolize) + export LIBTOOLIZE=$(command -v glibtoolize) elif [[ ! -z $(command -v libtool) ]]; then - LIBTOOLIZE=$(command -v libtool) + export LIBTOOLIZE=$(command -v libtool) elif [[ ! -z $(command -v glibtool) ]]; then - LIBTOOLIZE=$(command -v glibtool) + export LIBTOOLIZE=$(command -v glibtool) fi ############################################################################# @@ -92,12 +92,16 @@ if ! autoupdate &>/dev/null; then exit 1 fi +if false; then + echo "Running libtoolize" if ! "$LIBTOOLIZE" --force --install &>/dev/null; then echo "libtoolize failed... skipping." # exit 1 fi +fi + # Run autoreconf twice on failure. Also see # https://github.com/tracebox/tracebox/issues/57 echo "Running autoreconf" -- cgit v1.2.1