r18339 - gnucash/trunk/packaging/win32 - Update gwenhywfar+aqbanking packages - Martin has just released new versions including our patches.

[Christian Stimming]

Author: cstim
Date: 2009-09-23 05:37:17 -0400 (Wed, 23 Sep 2009)
New Revision: 18339
Trac: http://svn.gnucash.org/trac/changeset/18339

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
Update gwenhywfar+aqbanking packages - Martin has just released new versions including our patches.

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2009-09-23 09:37:03 UTC (rev 18338)
+++ gnucash/trunk/packaging/win32/defaults.sh	2009-09-23 09:37:17 UTC (rev 18339)
@@ -263,8 +263,8 @@
 if [ "$AQBANKING3" != "yes" ]; then
     set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz"
 else
-    set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=28&file=01&dummy=gwenhywfar-3.11.0.tar.gz"
-    set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.0-patch.diff
+    set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=29&file=01&dummy=gwenhywfar-3.11.1.tar.gz"
+    #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.0-patch.diff
 fi
 set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
 
@@ -274,8 +274,8 @@
 if [ "$AQBANKING3" != "yes" ]; then
     set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
 else
-    set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=35&file=01&dummy=aqbanking-3.8.3.tar.gz"
-    set_default AQBANKING_PATCH `pwd`/aqbanking-3.8.3-patch.diff
+    set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=44&file=01&dummy=aqbanking-4.1.7.tar.gz"
+    #set_default AQBANKING_PATCH `pwd`/aqbanking-4.1.6-patch.diff
 fi
 set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
 set_default AQBANKING_WITH_QT yes

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2009-09-23 09:37:03 UTC (rev 18338)
+++ gnucash/trunk/packaging/win32/install.sh	2009-09-23 09:37:17 UTC (rev 18339)
@@ -886,12 +886,12 @@
                     CPPFLAGS="${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS}" \
                     LDFLAGS="${REGEX_LDFLAGS} ${GNOME_LDFLAGS} -lintl"
             else
-                [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] && \
+                if [ -n "$GWENHYWFAR_PATCH" -a -f "$GWENHYWFAR_PATCH" ] ; then
                     patch -p1 < $GWENHYWFAR_PATCH
-                # The current patch modifies configure.ac, so we need to call the autotools
-                aclocal -I ${ACLOCAL_FLAGS} -I m4
-                automake
-                autoconf
+                    aclocal -I ${ACLOCAL_FLAGS} -I m4
+                    automake
+                    autoconf
+                fi
                 ./configure ${HOST_XCOMPILE} \
                     --with-openssl-includes=$_OPENSSL_UDIR/include \
                     --with-openssl-libs=$_OPENSSL_UDIR/lib \