From a0030a488aafc74d36ce7511db9da229010ce528 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Tue, 8 May 2018 11:23:56 +0200 Subject: iOS: build.sh does not run configure for libdivecomputer In a "virgin" repo incl. libdivecomputer, starting by running ios/build.sh caused an error in libdivecomputer, because autoreconf was never run. Changed build.sh to check if libdivecomputer/configure exist, if not run autoreconf Signed-off-by: Jan Iversen --- packaging/ios/build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index bef6904a2..a6197fbe7 100755 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -281,17 +281,18 @@ echo next building for $ARCH if [ ! -d ../../libdivecomputer/src ] ; then pushd ../.. git submodule init - git submodule update --recursive - pushd libdivecomputer + popd + fi + git submodule update --recursive + if [ ! -f ../../libdivecomputer/configure ] ; then + pushd ../../libdivecomputer autoreconf --install autoreconf --install popd - popd fi if [ ! -f libdivecomputer-${ARCH}.SHA ] ; then echo "" > libdivecomputer-${ARCH}.SHA fi - git submodule update --recursive CURRENT_SHA=$(cd ../../libdivecomputer ; git describe) PREVIOUS_SHA=$(cat libdivecomputer-${ARCH}.SHA) if [ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" ] ; then -- cgit v1.2.3-70-g09d2