r20567 - gnucash/trunk/packaging/win32 - Win32 build: Update libofx version.

[Christian Stimming]

Author: cstim
Date: 2011-04-19 07:32:51 -0400 (Tue, 19 Apr 2011)
New Revision: 20567
Trac: http://svn.gnucash.org/trac/changeset/20567

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install-impl.sh
Log:
Win32 build: Update libofx version.

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2011-04-19 09:22:15 UTC (rev 20566)
+++ gnucash/trunk/packaging/win32/defaults.sh	2011-04-19 11:32:51 UTC (rev 20567)
@@ -352,7 +352,8 @@
 set_default OPENSP_DIR $GLOBAL_DIR\\opensp
 set_default OPENSP_PATCH `pwd`/opensp-1.5.2-patch.diff
 
-set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-0.9.2.tar.gz"
+LIBOFX_VERSION="0.9.4"
+set_default LIBOFX_URL "$SF_MIRROR/libofx/libofx-${LIBOFX_VERSION}.tar.gz"
 set_default LIBOFX_DIR $GLOBAL_DIR\\libofx
 #set_default LIBOFX_PATCH `pwd`/libofx-0.8.3-patch.diff
 

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2011-04-19 09:22:15 UTC (rev 20566)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2011-04-19 11:32:51 UTC (rev 20567)
@@ -1047,7 +1047,7 @@
     _LIBOFX_UDIR=`unix_path ${LIBOFX_DIR}`
     add_to_env ${_LIBOFX_UDIR}/bin PATH
     add_to_env ${_LIBOFX_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
-    if quiet ${PKG_CONFIG} --exists libofx
+    if quiet ${PKG_CONFIG} --exists libofx && quiet ${PKG_CONFIG} --atleast-version=${LIBOFX_VERSION} libofx
     then
         echo "Libofx already installed in $_LIBOFX_UDIR. skipping."
     else
@@ -1068,7 +1068,7 @@
                 --with-opensp-libs=${_OPENSP_UDIR}/lib \
                 CPPFLAGS="-DOS_WIN32 ${GNOME_CPPFLAGS}" \
                 --disable-static \
-		--with-iconv=${_GNOME_UDIR}
+                --with-iconv=${_GNOME_UDIR}
             make LDFLAGS="${LDFLAGS} -no-undefined ${GNOME_LDFLAGS} -liconv"
             make install
         qpopd