From 83ca113ef754c587b619d384af187698d24796d2 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 23 Aug 2017 22:00:58 +0100
Subject: [PATCH] guile path

---
 src/freedombone-utils-guile | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/freedombone-utils-guile b/src/freedombone-utils-guile
index 061dc3e0..efda73c2 100755
--- a/src/freedombone-utils-guile
+++ b/src/freedombone-utils-guile
@@ -32,7 +32,7 @@ GUILE_VERSION='2.2.0'
 GUILE_HASH='c707b9cf6f97ecca3a4e3e704e62b83f95f1aec28ed1535f5d0a1d36af07a015'
 
 EIGHTSYNC_REPO="git://git.savannah.gnu.org/8sync.git"
-EIGHTSYNC_COMMIT=''
+EIGHTSYNC_COMMIT='8cbb7f22227c0afdd3b0bd758ebec0efba2fa1e1'
 
 function install_8sync {
     apt-get -qy install flex libunistring-dev libgc-dev autoconf texinfo
@@ -45,10 +45,11 @@ function install_8sync {
     git_clone $EIGHTSYNC_REPO $INSTALL_DIR/eightsync
     cd $INSTALL_DIR/eightsync
     git checkout ${EIGHTSYNC_COMMIT} -b ${EIGHTSYNC_COMMIT}
-    GUILE_PATH=/opt/guile-${GUILE_VERSION}
-    PATH=${GUILE_PATH}/bin:$PATH
-    export GUILE_CFLAGS="-I${GUILE_PATH}/include"
-    export GUILE_LIBS="-L${GUILE_PATH}/lib"
+    #GUILE_PATH=/opt/guile-${GUILE_VERSION}
+    export GUILE_BASE_PATH=/opt/guile-${GUILE_VERSION}
+    export GUILE_CFLAGS="-I${GUILE_BASE_PATH}/include"
+    export GUILE_LIBS="-L${GUILE_BASE_PATH}/lib -lguile -lqthreads -ldl -ltermcap -lsocket -lnsl -lm"
+    sed -i '/PKG_CHECK_MODULES/d' configure.ac
     ./bootstrap.sh
     configure
     make
@@ -84,6 +85,12 @@ function install_guile {
     fi
     cd /
     tar xvf $INSTALL_DIR/guile-${GUILE_VERSION}-pack-${GUILE_ARCH}-linux-gnu.tar.lz
+    if [ ! -d /opt/guile-${GUILE_VERSION}/bin ]; then
+        echo 'Guile was not installed'
+        exit 825269
+    fi
+    echo "export GUILE_PATH=/opt/guile-${GUILE_VERSION}/bin" >> ~/.bashrc
+    echo 'export PATH=$PATH:$GUILE_PATH' >> ~/.bashrc
 }
 
 # NOTE: deliberately no exit 0