gnucash maint: Use cmake_symbol_check to test for AB_Banking_RuntimeConfig_SetCharValue

John Ralls jralls at code.gnucash.org
Tue Aug 13 13:57:44 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/adae341d (commit)
	from  https://github.com/Gnucash/gnucash/commit/2a6a4e34 (commit)



commit adae341def2398891a3b6a9c0af0e59417debfcd
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Aug 11 09:43:27 2019 -0700

    Use cmake_symbol_check to test for AB_Banking_RuntimeConfig_SetCharValue
    
    instead of relying on AQBanking versions.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d78668dcd..c417bd1f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,7 @@ include (GncAddTest)
 include (MakeDistFiles)
 include (GNUInstallDirs)
 include (TestBigEndian)
+include (CheckSymbolExists)
 
 # ############################################################
 # These options are settable from the CMake command line. For example, to disable
@@ -359,6 +360,13 @@ endif ()
 if (WITH_AQBANKING)
   pkg_check_modules (GWENHYWFAR REQUIRED gwenhywfar>=4.9.99)
   pkg_check_modules (AQBANKING REQUIRED aqbanking>=5.3.4)
+  set(CMAKE_REQUIRED_INCLUDES "${AQBANKING_INCLUDE_DIRS}"
+    "${GWENHYWFAR_INCLUDE_DIRS}")
+  set(CMAKE_REQUIRED_LIBRARIES "-laqbanking")
+  check_symbol_exists("AB_Banking_RuntimeConfig_SetCharValue"
+    "aqbanking/banking.h" AQB_HAS_RUNTIME_CONFIG)
+  set(CMAKE_REQUIRED_INCLUDES)
+  set(CMAKE_REQUIRED_LIBRARIES)
   if(WITH_GNUCASH)
     pkg_check_modules (GWEN_GTK3 gwengui-gtk3)
     if(GWEN_GTK3_FOUND AND GWEN_GTK3_VERSION VERSION_GREATER "4.20.0")
diff --git a/common/config.h.cmake.in b/common/config.h.cmake.in
index 7a2ca2f51..dd9b4b6b7 100644
--- a/common/config.h.cmake.in
+++ b/common/config.h.cmake.in
@@ -363,6 +363,9 @@
 #cmakedefine WEBKIT2_3 1
 #cmakedefine WEBKIT1 1
 
+/* Definition for AQBanking Runtime Config feature */
+#cmakedefine AQB_HAS_RUNTIME_CONFIG 1
+
 /* Definitions for all OS */
 /* From cutecash */
 //#define HAVE_LIBQOF /**/
diff --git a/gnucash/import-export/aqb/gnc-ab-utils.c b/gnucash/import-export/aqb/gnc-ab-utils.c
index b2dbd1057..89510918b 100644
--- a/gnucash/import-export/aqb/gnc-ab-utils.c
+++ b/gnucash/import-export/aqb/gnc-ab-utils.c
@@ -159,10 +159,7 @@ gnc_AB_BANKING_new(void)
         api = AB_Banking_new("gnucash", NULL, 0);
         g_return_val_if_fail(api, NULL);
 
-#if AQBANKING_VERSION_INT >= 59925 \
-    || (AQBANKING_VERSION_INT == 59924 && AQBANKING_VERSION_BUILD >= 1) \
-    || (AQBANKING_VERSION_INT >= 50709 && AQBANKING_VERSION_INT < 59900) \
-    || (AQBANKING_VERSION_INT == 50708 && AQBANKING_VERSION_BUILD >= 1)
+#if AQB_HAS_RUNTIME_CONFIG
         /* These two values must be set because newest bank regulation requires
         the bank servers to require it. The string itself results from our
         registration with the German bank association at



Summary of changes:
 CMakeLists.txt                           | 8 ++++++++
 common/config.h.cmake.in                 | 3 +++
 gnucash/import-export/aqb/gnc-ab-utils.c | 5 +----
 3 files changed, 12 insertions(+), 4 deletions(-)



More information about the gnucash-changes mailing list