r17614 - gnucash/trunk/packaging/win32 - Win32: Improve cross-compiling of aqbanking.

Andreas Köhler andi5 at cvs.gnucash.org
Sun Oct 5 09:48:58 EDT 2008


Author: andi5
Date: 2008-10-05 09:48:57 -0400 (Sun, 05 Oct 2008)
New Revision: 17614
Trac: http://svn.gnucash.org/trac/changeset/17614

Modified:
   gnucash/trunk/packaging/win32/aqbanking-3.7.2.patch
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
Win32: Improve cross-compiling of aqbanking.


Modified: gnucash/trunk/packaging/win32/aqbanking-3.7.2.patch
===================================================================
--- gnucash/trunk/packaging/win32/aqbanking-3.7.2.patch	2008-10-02 09:19:30 UTC (rev 17613)
+++ gnucash/trunk/packaging/win32/aqbanking-3.7.2.patch	2008-10-05 13:48:57 UTC (rev 17614)
@@ -1,6 +1,17 @@
+diff -Nur aqbanking-3.7.1-old/configure.ac aqbanking-3.7.1/configure.ac
+--- aqbanking-3.7.1-old/configure.ac	2008-08-16 13:36:42.000000000 +0200
++++ aqbanking-3.7.1/configure.ac	2008-10-05 13:37:48.295980988 +0200
+@@ -511,7 +511,6 @@
+ #
+ # Checks for library functions.
+ #
+-AC_FUNC_MALLOC
+ AC_FUNC_STRFTIME
+ AC_CHECK_FUNCS([memmove memset strcasecmp strdup strerror snprintf])
+ AC_CHECK_FUNCS([setlocale])
 diff -Nur aqbanking-3.7.1-old/src/frontends/qbanking/bin/helpbrowser/Makefile.am aqbanking-3.7.1/src/frontends/qbanking/bin/helpbrowser/Makefile.am
---- aqbanking-3.7.1-old/src/frontends/qbanking/bin/helpbrowser/Makefile.am	Thu Jul 31 18:13:32 2008
-+++ aqbanking-3.7.1/src/frontends/qbanking/bin/helpbrowser/Makefile.am	Sun Sep 28 18:54:56 2008
+--- aqbanking-3.7.1-old/src/frontends/qbanking/bin/helpbrowser/Makefile.am	2008-07-31 20:13:31.000000000 +0200
++++ aqbanking-3.7.1/src/frontends/qbanking/bin/helpbrowser/Makefile.am	2008-10-05 13:37:38.257983188 +0200
 @@ -65,7 +65,7 @@
  
  # This section is for a qt4 environment

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2008-10-02 09:19:30 UTC (rev 17613)
+++ gnucash/trunk/packaging/win32/defaults.sh	2008-10-05 13:48:57 UTC (rev 17614)
@@ -327,13 +327,14 @@
  add_step inst_mingwutils
  if [ "$AQBANKING3" != "yes" ]; then
   add_step inst_openssl
- else
-  add_step inst_gnutls
  fi
 fi
 add_step inst_exetype
 add_step inst_libxslt
 add_step inst_gnome
+if [ "$AQBANKING3" = "yes" ]; then
+ add_step inst_gnutls
+fi
 add_step inst_swig
 add_step inst_pcre
 add_step inst_libgsf

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2008-10-02 09:19:30 UTC (rev 17613)
+++ gnucash/trunk/packaging/win32/install.sh	2008-10-05 13:48:57 UTC (rev 17614)
@@ -838,13 +838,13 @@
     add_to_env "-I${_GNUTLS_UDIR}/include" GNUTLS_CPPFLAGS
     add_to_env "-L${_GNUTLS_UDIR}/lib" GNUTLS_LDFLAGS
     add_to_env "-I $_GNUTLS_UDIR/share/aclocal" ACLOCAL_FLAGS
-    if quiet which gnutls-cli
+    if quiet ${PKG_CONFIG} --exists gnutls
     then
         echo "GNUTLS already installed. skipping."
     else
         wget_unpacked $GNUTLS_URL $DOWNLOAD_DIR $GNUTLS_DIR
         rm -f $_GNUTLS_UDIR/lib/*.la
-        quiet which gnutls-cli || die "GNUTLS not installed correctly"
+        quiet ${PKG_CONFIG} --exists gnutls || die "GNUTLS not installed correctly"
     fi
 }
 
@@ -963,10 +963,16 @@
                 patch -p1 < $AQBANKING_PATCH
                 make -f Makefile.cvs
             fi
+            if test x$CROSS_COMPILE = xyes; then
+                XMLMERGE="xmlmerge"
+            else
+                XMLMERGE="${GWENHYWFAR_UDIR}/bin/xmlmerge"
+            fi
             if test x$AQBANKING_WITH_QT = xyes; then
                 inst_qt4
-                ./configure \
+                ./configure ${HOST_XCOMPILE} \
                     --with-gwen-dir=${_GWENHYWFAR_UDIR} \
+                    --with-xmlmerge=${XMLMERGE} \
                     --with-frontends="cbanking qbanking" \
                     --with-backends="aqhbci aqofxconnect" \
                     CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \
@@ -977,8 +983,9 @@
                 make qt4-port
                 make clean
             else
-                ./configure \
+                ./configure ${HOST_XCOMPILE} \
                     --with-gwen-dir=${_GWENHYWFAR_UDIR} \
+                    --with-xmlmerge=${XMLMERGE} \
                     --with-frontends="cbanking" \
                     --with-backends="aqdtaus aqhbci aqofxconnect" \
                     CPPFLAGS="${_AQ_CPPFLAGS} ${GMP_CPPFLAGS}" \



More information about the gnucash-changes mailing list