From 25041be08c8b5729ce2d6f2b0a07a5c7fab65132 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Sun, 3 Dec 2017 12:53:56 -0800
Subject: [PATCH] libdc: update the MXE build script for submodule

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 packaging/windows/mxe-based-build.sh | 16 ++++++----------
 scripts/windows/before_install.sh    |  3 +++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/packaging/windows/mxe-based-build.sh b/packaging/windows/mxe-based-build.sh
index 3c6c7fa34..824604eec 100755
--- a/packaging/windows/mxe-based-build.sh
+++ b/packaging/windows/mxe-based-build.sh
@@ -42,7 +42,6 @@
 # ~/src/mxe                    <- MXE git with Qt5, automake (see above)
 #      /grantlee               <- Grantlee 5.0.0 sources from git
 #      /subsurface             <- current subsurface git
-#      /libdivecomputer        <- appropriate libdc/Subsurface-branch branch
 #      /libgit2                <- libgit2 0.23.1 or similar
 #      /googlemaps             <- Google Maps plugin for QtLocation from git
 #
@@ -158,22 +157,19 @@ if [[ ! -d libgit2 || -f build.libgit2 ]] ; then
 fi
 
 # libdivecomputer
-#
-# this one is special because we want to make sure it's in sync
-# with the Linux builds, but we don't want the autoconf files cluttering
-# the original source directory... so the "$BASEDIR"/libdivecomputer is
-# a local clone of the "real" libdivecomputer directory
+
+cd "$BASEDIR"/subsurface
+if [ ! -d libdivecomputer/src ] ; then
+	git submodule update --recursive
+fi
 
 cd "$BUILDDIR"
 if [[ ! -d libdivecomputer || -f build.libdivecomputer ]] ; then
 	rm -f build.libdivecomputer
-	cd "$BASEDIR"/libdivecomputer
-	git pull
-	cd "$BUILDDIR"
 	mkdir -p libdivecomputer
 	cd libdivecomputer
 
-	"$BASEDIR"/libdivecomputer/configure \
+	"$BASEDIR"/subsurface/libdivecomputer/configure \
 		CC=i686-w64-mingw32.shared-gcc \
 		--host=i686-w64-mingw32.shared \
 		--enable-shared \
diff --git a/scripts/windows/before_install.sh b/scripts/windows/before_install.sh
index 7eef67d17..16a75e139 100644
--- a/scripts/windows/before_install.sh
+++ b/scripts/windows/before_install.sh
@@ -40,6 +40,9 @@ CURRENT_LIBGIT2="v0.26.0"
 echo "Get libdivecomputer"
 cd ${TRAVIS_BUILD_DIR}
 git submodule update --recursive
+cd libdivecomputer
+autoreconf --install
+autoreconf --install
 
 echo "Get libusb"
 cd ${TRAVIS_BUILD_DIR}/..