arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Guard for missing libtoolize

pull/696/head
Jeffrey Walton 2018-08-01 13:57:35 -04:00
parent 57521bd22a
commit 89ec3c4a25
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
TestScripts/cryptest-autotools.sh
View File

@ -49,15 +49,15 @@ fi
mkdir -p m4/ mkdir -p m4/
if [[ -z $(command -v autoupdate) ]]; then if [[ -z $(command -v autoupdate) ]]; then
echo "Cannot find autoupdate. Things will probably fail." echo "Cannot find autoupdate. Things may fail."
fi fi
if [[ -z $(command -v libtoolize) ]]; then if [[ -z $(command -v libtoolize) ]]; then
echo "Cannot find libtoolize. Things will probably fail." echo "Cannot find libtoolize. Things may fail."
fi fi
if [[ -z $(command -v autoreconf) ]]; then if [[ -z $(command -v autoreconf) ]]; then
echo "Cannot find autoreconf. Things will probably fail." echo "Cannot find autoreconf. Things may fail."
fi fi
if ! autoupdate; then if ! autoupdate; then
@ -65,38 +65,37 @@ if ! autoupdate; then
[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1 [[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
fi fi
if ! libtoolize -fi; then if ! autoreconf -fi; then
echo "libtoolize failed." echo "autoreconf failed, running libtoolize."
[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1 if ! libtoolize -fi; then
fi echo "libtoolize failed."
[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
if ! autoreconf -fi --warnings=all; then fi
echo "autoreconf failed, running again."
if ! autoreconf -vfi; then if ! autoreconf -vfi; then
echo "autoreconf failed" echo "autoreconf failed, again."
[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1 [[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
fi fi
fi fi
if ! ./configure; then if ! ./configure; then
echo "configure failed" echo "configure failed."
[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1 [[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
fi fi
make clean 2>/dev/null make clean 2>/dev/null
if ! "$MAKE" -j2 -f Makefile; then if ! "$MAKE" -j2 -f Makefile; then
echo "make failed" echo "make failed."
[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1 [[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
fi fi
if ! ./cryptestcwd v; then if ! ./cryptestcwd v; then
echo "cryptestcwd v failed" echo "cryptestcwd v failed."
[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1 [[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
fi fi
if ! ./cryptestcwd tv all; then if ! ./cryptestcwd tv all; then
echo "cryptestcwd tv all failed" echo "cryptestcwd tv all failed."
[[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1 [[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
fi fi