AUDIT: r17288 - gnucash/trunk - Merge branches/aqbanking3 (r17287) into trunk.

Andreas Köhler andi5 at cvs.gnucash.org
Tue Jul 8 16:35:51 EDT 2008


Author: andi5
Date: 2008-07-08 16:35:50 -0400 (Tue, 08 Jul 2008)
New Revision: 17288
Trac: http://svn.gnucash.org/trac/changeset/17288

Added:
   gnucash/trunk/src/import-export/aqbanking/
Modified:
   gnucash/trunk/configure.in
   gnucash/trunk/doc/examples/downloaded.mt940
   gnucash/trunk/macros/svn2cl.xsl
   gnucash/trunk/src/bin/gnucash-bin.c
   gnucash/trunk/src/import-export/Makefile.am
   gnucash/trunk/src/import-export/aqbanking/schemas/
   gnucash/trunk/src/import-export/hbci/Makefile.am
Log:
Merge branches/aqbanking3 (r17287) into trunk.

Port the HBCI import-export module to AqBanking3.  Depending on the aqbanking
version found, either the classic hbci/ module or the new, very similar, module
aqbanking3/ for AqBanking >= 3 is built and installed.  The influence on the
rest of the code is minimal.

BP


Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2008-07-08 17:26:34 UTC (rev 17287)
+++ gnucash/trunk/configure.in	2008-07-08 20:35:50 UTC (rev 17288)
@@ -831,38 +831,46 @@
 ### --------------------------------------------------------------------------
 ### MT940
 AC_ARG_ENABLE( mt940,
-  [  --enable-mt940               Obsolete, included in --enable-hbci],
+  [  --enable-mt940               obsolete, included in --enable-aqbanking],
   if test "x$enableval" != "xno" ; then
-    AC_MSG_ERROR([--enable-mt940 is obsolete -- all functionality is already included in --enable-hbci])
+    AC_MSG_ERROR([--enable-mt940 is obsolete -- all functionality is already included in --enable-aqbanking])
   fi)
 
 ### --------------------------------------------------------------------------
-### HBCI
+### AqBanking
+
+AC_ARG_ENABLE( aqbanking,
+  [  --enable-aqbanking           compile with AqBanking support],
+  if test "x$enableval" != "xno" ; then
+    want_aqbanking=yes
+  fi)
 AC_ARG_ENABLE( hbci,
-  [  --enable-hbci                compile with HBCI support (needs AqBanking)],
+  [  --enable-hbci                an alias for --enable-aqbanking],
   if test "x$enableval" != "xno" ; then
-    HBCI_DIR=hbci
+    want_aqbanking=yes
   fi)
-if test x${HBCI_DIR} = xhbci ;
+if test x${want_aqbanking} = xyes ;
 then
-    # Check for Aqbanking library
-    # aqbanking-1.6.1 was released on 2005-11-04; aqbanking ships with
-    # a pkg-config file since 1.6.1.
-    PKG_CHECK_MODULES(HBCI, aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar, [], [
-      AC_MSG_ERROR([Could not find aqbanking > 1.6.0 and < 2.9.0. If you use --enable-hbci, you *have* to have aqbanking installed. Note that gnucash requires aqbanking2 and not (yet) aqbanking3!])
+  # Check for Aqbanking library
+  # aqbanking-1.6.1 was released on 2005-11-04; aqbanking ships with
+  # a pkg-config file since 1.6.1.
+  PKG_CHECK_MODULES(AQBANKING, aqbanking >= 3.0.0 gwenhywfar, [AQBANKING_DIR=aqbanking], [
+    PKG_CHECK_MODULES(AQBANKING, aqbanking >= 1.6.1 aqbanking < 2.9.0 gwenhywfar, [AQBANKING_DIR=hbci], [
+      AC_MSG_ERROR([Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!])
     ])
+  ])
 
-    # also check for ktoblzcheck
-    AC_CHECK_HEADERS(ktoblzcheck.h)
-    if test "x$ac_cv_header_ktoblzcheck_h" != xno; then
-	HBCI_LIBS="${HBCI_LIBS} -lktoblzcheck"  
-    fi
+  # also check for ktoblzcheck
+  AC_CHECK_HEADERS(ktoblzcheck.h)
+  if test "x$ac_cv_header_ktoblzcheck_h" != xno; then
+    AQBANKING_LIBS="${AQBANKING_LIBS} -lktoblzcheck"
+  fi
 
-    AS_SCRUB_INCLUDE(HBCI_CFLAGS)
-    AC_SUBST(HBCI_LIBS)
-    AC_SUBST(HBCI_CFLAGS)
+  AS_SCRUB_INCLUDE(AQBANKING_CFLAGS)
+  AC_SUBST(AQBANKING_LIBS)
+  AC_SUBST(AQBANKING_CFLAGS)
 fi
-AC_SUBST(HBCI_DIR)
+AC_SUBST(AQBANKING_DIR)
 
 ### --------------------------------------------------------------------------
 ### i18n
@@ -1537,6 +1545,8 @@
           src/import-export/ofx/test/Makefile
           src/import-export/csv/Makefile
           src/import-export/log-replay/Makefile
+          src/import-export/aqbanking/Makefile
+          src/import-export/aqbanking/schemas/Makefile
           src/import-export/hbci/Makefile
           src/import-export/hbci/glade/Makefile
           src/import-export/hbci/schemas/Makefile
@@ -1606,8 +1616,8 @@
 if test x${OFX_DIR} != x; then
 components="$components ofx"
 fi
-if test x${HBCI_DIR} != x; then
-components="$components hbci"
+if test x${AQBANKING_DIR} != x; then
+components="$components $AQBANKING_DIR"
 fi
 if test x${PYTHON_DIR} != x; then
 components="$components python-bindings"

Modified: gnucash/trunk/doc/examples/downloaded.mt940
===================================================================
--- gnucash/trunk/doc/examples/downloaded.mt940	2008-07-08 17:26:34 UTC (rev 17287)
+++ gnucash/trunk/doc/examples/downloaded.mt940	2008-07-08 20:35:50 UTC (rev 17288)
@@ -1,4 +1,3 @@
-
 :20:STARTUMS  
 :25:80007777/2602272001
 :28C:0

Modified: gnucash/trunk/macros/svn2cl.xsl
===================================================================
--- gnucash/trunk/macros/svn2cl.xsl	2008-07-08 17:26:34 UTC (rev 17287)
+++ gnucash/trunk/macros/svn2cl.xsl	2008-07-08 20:35:50 UTC (rev 17288)
@@ -102,6 +102,9 @@
  </xsl:variable>
  <xsl:variable name="branches">
   <branch>
+   <prefix>gnucash/branches/aqbanking3</prefix>
+  </branch>
+  <branch>
    <prefix>gnucash/branches/csv-import</prefix>
   </branch>
   <branch>

Modified: gnucash/trunk/src/bin/gnucash-bin.c
===================================================================
--- gnucash/trunk/src/bin/gnucash-bin.c	2008-07-08 17:26:34 UTC (rev 17287)
+++ gnucash/trunk/src/bin/gnucash-bin.c	2008-07-08 20:35:50 UTC (rev 17288)
@@ -340,6 +340,7 @@
         { "gnucash/import-export/ofx", 0, TRUE },
         { "gnucash/import-export/csv", 0, TRUE },
         { "gnucash/import-export/log-replay", 0, TRUE },
+        { "gnucash/import-export/aqbanking", 0, TRUE },
         { "gnucash/import-export/hbci", 0, TRUE },
         { "gnucash/report/report-system", 0, FALSE },
         { "gnucash/report/stylesheets", 0, FALSE },

Modified: gnucash/trunk/src/import-export/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/Makefile.am	2008-07-08 17:26:34 UTC (rev 17287)
+++ gnucash/trunk/src/import-export/Makefile.am	2008-07-08 20:35:50 UTC (rev 17288)
@@ -1,7 +1,7 @@
 SUBDIRS = . schemas qif qif-import \
-	${OFX_DIR} ${HBCI_DIR} log-replay test csv
+	${OFX_DIR} ${AQBANKING_DIR} log-replay test csv
 DIST_SUBDIRS = schemas qif qif-import qif-io-core \
-	ofx hbci log-replay test csv
+	ofx aqbanking hbci log-replay test csv
 
 pkglib_LTLIBRARIES=libgncmod-generic-import.la
 

Copied: gnucash/trunk/src/import-export/aqbanking (from rev 17287, gnucash/branches/aqbanking3/src/import-export/aqbanking)


Property changes on: gnucash/trunk/src/import-export/aqbanking
___________________________________________________________________
Name: svn:ignore
   + .deps
.libs
.scm-links
*.gladep
*.la
*.lo
Makefile
Makefile.in
semantic.cache


Modified: gnucash/trunk/src/import-export/hbci/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/hbci/Makefile.am	2008-07-08 17:26:34 UTC (rev 17287)
+++ gnucash/trunk/src/import-export/hbci/Makefile.am	2008-07-08 20:35:50 UTC (rev 17288)
@@ -56,7 +56,7 @@
   ${GLADE_LIBS} \
   ${QOF_LIBS} \
   ${GLIB_LIBS} \
-  ${HBCI_LIBS}
+  ${AQBANKING_LIBS}
 
 AM_CFLAGS = \
   -I${top_srcdir}/src \
@@ -77,7 +77,7 @@
   ${GLADE_CFLAGS} \
   ${QOF_CFLAGS} \
   ${GLIB_CFLAGS} \
-  ${HBCI_CFLAGS}
+  ${AQBANKING_CFLAGS}
 
 #gladedir = $(GNC_GLADE_DIR)
 #glade_DATA = 



More information about the gnucash-changes mailing list