r19540 - gnucash/trunk/packaging/win32 - Win32: Add pkg-config version check for aqbanking so that the new version is installed without removing the old one manually.

[Christian Stimming]

Author: cstim
Date: 2010-09-03 12:18:58 -0400 (Fri, 03 Sep 2010)
New Revision: 19540
Trac: http://svn.gnucash.org/trac/changeset/19540

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install-impl.sh
Log:
Win32: Add pkg-config version check for aqbanking so that the new version is installed without removing the old one manually.

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2010-09-03 16:08:20 UTC (rev 19539)
+++ gnucash/trunk/packaging/win32/defaults.sh	2010-09-03 16:18:58 UTC (rev 19540)
@@ -340,7 +340,7 @@
     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"
     set_default AQBANKING_WITH_QT no
 else
-    set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=49&file=01&dummy=aqbanking-4.2.3.tar.gz"
+    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"
     #set_default AQBANKING_PATCH `pwd`/aqbanking-4.1.6-patch.diff
     set_default AQBANKING_WITH_QT yes
 fi

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2010-09-03 16:08:20 UTC (rev 19539)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2010-09-03 16:18:58 UTC (rev 19540)
@@ -964,7 +964,12 @@
     _GWENHYWFAR_UDIR=`unix_path ${GWENHYWFAR_DIR}`
     add_to_env ${_GWENHYWFAR_UDIR}/bin PATH
     add_to_env ${_GWENHYWFAR_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
-    if quiet ${PKG_CONFIG} --exists gwenhywfar
+    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
     then
         echo "Gwenhywfar already installed. skipping."
     else
@@ -1066,7 +1071,12 @@
     _AQBANKING_UDIR=`unix_path ${AQBANKING_DIR}`
     add_to_env ${_AQBANKING_UDIR}/bin PATH
     add_to_env ${_AQBANKING_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
-    if quiet ${PKG_CONFIG} --exists aqbanking
+    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
     then
         echo "AqBanking already installed. skipping."
     else