gnucash-on-windows master: Restore libgcrypt to gnutls; included in older binary, not in new one.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/befc8f3a (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/36ba1083 (commit)



commit befc8f3afdd3b0174661a88560cab320f5512a83
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Oct 27 13:25:17 2014 -0700

    Restore libgcrypt to gnutls; included in older binary, not in new one.

diff --git a/defaults.sh b/defaults.sh
index a52165b..6022607 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -207,6 +207,10 @@ set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
 
 GNUTLS_VERSION="3.2.19"
 set_default GNUTLS_URL "ftp://ftp.gnutls.org/gcrypt/gnutls/w32/gnutls-${GNUTLS_VERSION}-w32.zip"
+GCRYPT_VERSION="1.6.2"
+set_default GCRYPT_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgcrypt/libgcrypt-${GCRYPT_VERSION}.tar.bz2"
+GPG_ERROR_VERSION="1.17"
+set_default GPG_ERROR_SRC_URL "ftp://ftp.gnutls.org/gcrypt/libgpg-error/libgpg-error-${GPG_ERROR_VERSION}.tar.bz2"
 set_default GNUTLS_DIR $GLOBAL_DIR\\gnutls
 
 set_default MINGW_UTILS_URL "$SF_MIRROR/mingw/mingw-utils-0.3.tar.gz"
diff --git a/install-impl.sh b/install-impl.sh
index 3699109..b232862 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -459,6 +459,26 @@ function inst_gnutls() {
         echo "GNUTLS already installed in $_GNUTLS_UDIR. skipping."
     else
         wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
+        wget_unpacked $GCRYPT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+        wget_unpacked $GPG_ERROR_SRC_URL $DOWNLOAD_DIR $TMP_DIR
+        mydir=`pwd`
+        assert_one_dir $TMP_UDIR/libgcrypt-*
+        assert_one_dir $TMP_UDIR/libgpg-error-*
+        qpushd $TMP_UDIR/libgpg-error-*
+            ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR  --disable-nls \
+                --disable-languages \
+                CPPFLAGS="${GNOME_CPPFLAGS}" \
+                LDFLAGS="${GNOME_LDFLAGS}"
+            make
+            make install
+        qpopd
+        qpushd $TMP_UDIR/libgcrypt-*
+            ./configure ${HOST_XCOMPILE} --prefix=$_GNUTLS_UDIR \
+                CPPFLAGS="${GNOME_CPPFLAGS}" \
+                LDFLAGS="${GNOME_LDFLAGS}"
+            make
+            make install
+        qpopd
         rm -f $_GNUTLS_UDIR/lib/*.la
         quiet ${PKG_CONFIG} --exists gnutls || die "GNUTLS not installed correctly"
     fi



Summary of changes:
 defaults.sh     |  4 ++++
 install-impl.sh | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)