From 1a90b586b10e049e29552f1d84d7a2b07fca89fc Mon Sep 17 00:00:00 2001
From: Christian Stimming <stimming@tuhh.de>
Date: Tue, 14 Sep 2010 19:26:04 +0000
Subject: [PATCH] Win32 build: Set gwen/aqbanking version numbers in
 defaults.sh.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19573 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/defaults.sh     | 12 ++++++++----
 packaging/win32/install-impl.sh | 14 ++------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh
index 8d3e8d8af1..007fac0af5 100644
--- a/packaging/win32/defaults.sh
+++ b/packaging/win32/defaults.sh
@@ -326,9 +326,11 @@ set_default AQBANKING5 no
 # needed.
 
 if [ "$AQBANKING5" = "yes" ]; then
-    set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=54&file=01&dummy=gwenhywfar-4.0.1.tar.gz"
+    GWENHYWFAR_VERSION="4.0.1"
+    set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=54&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
 else
-    set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-3.11.3.tar.gz"
+    GWENHYWFAR_VERSION="3.11.3"
+    set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=31&file=01&dummy=gwenhywfar-${GWENHYWFAR_VERSION}.tar.gz"
     #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.1-patch.diff
 fi
 set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
@@ -337,10 +339,12 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.24.tar.gz"
 # ktoblzcheck is being installed into GWENHYWFAR_DIR
 
 if [ "$AQBANKING5" = "yes" ]; then
-    set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=74&file=01&dummy=aqbanking-5.0.1.tar.gz"
+    AQBANKING_VERSION="5.0.1"
+    set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=74&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
     set_default AQBANKING_WITH_QT no
 else
-    set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=50&file=01&dummy=aqbanking-4.2.4.tar.gz"
+    AQBANKING_VERSION="4.2.4"
+    set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=50&file=01&dummy=aqbanking-${AQBANKING_VERSION}.tar.gz"
     #set_default AQBANKING_PATCH `pwd`/aqbanking-4.1.6-patch.diff
     set_default AQBANKING_WITH_QT yes
 fi
diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh
index b26e3d6e5d..73f1440b87 100755
--- a/packaging/win32/install-impl.sh
+++ b/packaging/win32/install-impl.sh
@@ -964,12 +964,7 @@ function inst_gwenhywfar() {
     _GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
     add_to_env ${_GWENHYWFAR_UDIR}/bin PATH
     add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
-    if [ "$AQBANKING5" = "yes" ]; then
-        _GWEN_VERSION="4.0.1"
-    else
-        _GWEN_VERSION="3.11.3"
-    fi
-    if quiet ${PKG_CONFIG} --atleast-version=${_GWEN_VERSION} gwenhywfar
+    if quiet ${PKG_CONFIG} --atleast-version=${GWENHYWFAR_VERSION} gwenhywfar
     then
         echo "Gwenhywfar already installed. skipping."
     else
@@ -1071,12 +1066,7 @@ function inst_aqbanking() {
     _AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
     add_to_env ${_AQBANKING_UDIR}/bin PATH
     add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
-    if [ "$AQBANKING5" = "yes" ]; then
-        _AQBANKING_VERSION="5.0.1"
-    else
-        _AQBANKING_VERSION="4.2.4"
-    fi
-    if quiet ${PKG_CONFIG} --atleast-version=${_AQBANKING_VERSION} aqbanking
+    if quiet ${PKG_CONFIG} --atleast-version=${AQBANKING_VERSION} aqbanking
     then
         echo "AqBanking already installed. skipping."
     else