gnucash unstable: Don't build borrowed/gwengui-gtk3 if its provided by gwenhywfar.
John Ralls
jralls at code.gnucash.org
Fri Dec 22 13:26:45 EST 2017
Updated via https://github.com/Gnucash/gnucash/commit/6e9025d2 (commit)
from https://github.com/Gnucash/gnucash/commit/e0300d3a (commit)
commit 6e9025d2f93c9c1f36c9da84ae083eb339ce26ab
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Dec 22 10:26:31 2017 -0800
Don't build borrowed/gwengui-gtk3 if its provided by gwenhywfar.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05aff73..0a021a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -319,6 +319,10 @@ IF (WITH_AQBANKING)
IF(KTOBLZCHECK_FOUND)
SET(HAVE_KTOBLZCHECK_H 1)
ENDIF(KTOBLZCHECK_FOUND)
+ GNC_PKG_CHECK_MODULES (GWEN_GTK3 gwengui-gtk3)
+ IF(GWEN_GTK3_FOUND)
+ SET(HAVE_GWEN_GTK3 1 CACHE BOOL "True if gwen-gtk3.pc exists")
+ ENDIF(GWEN_GTK3_FOUND)
ENDIF(WITH_GNUCASH)
ENDIF (WITH_AQBANKING)
diff --git a/borrowed/CMakeLists.txt b/borrowed/CMakeLists.txt
index 1d10252..bae9763 100644
--- a/borrowed/CMakeLists.txt
+++ b/borrowed/CMakeLists.txt
@@ -1,6 +1,6 @@
ADD_SUBDIRECTORY(libc)
ADD_SUBDIRECTORY(goffice)
-if (WITH_AQBANKING)
+if (WITH_AQBANKING AND NOT HAVE_GWEN_GTK3)
ADD_SUBDIRECTORY(gwengui-gtk3)
endif()
SET_LOCAL_DIST(borrowed_DIST_local CMakeLists.txt Makefile.am README)
diff --git a/gnucash/import-export/aqb/gnc-gwen-gui.c b/gnucash/import-export/aqb/gnc-gwen-gui.c
index db8792f..592e029 100644
--- a/gnucash/import-export/aqb/gnc-gwen-gui.c
+++ b/gnucash/import-export/aqb/gnc-gwen-gui.c
@@ -196,7 +196,7 @@ static gint progress_advance_cb(GWEN_GUI *gwen_gui, uint32_t id,
static gint progress_log_cb(GWEN_GUI *gwen_gui, guint32 id,
GWEN_LOGGER_LEVEL level, const gchar *text);
static gint progress_end_cb(GWEN_GUI *gwen_gui, guint32 id);
-#if GWENHYWFAR_VERSION_INT <= 49900
+#if GWENHYWFAR_VERSION_INT < 49900
static gint GNC_GWENHYWFAR_CB getpassword_cb(GWEN_GUI *gwen_gui, guint32 flags,
const gchar *token,
const gchar *title,
@@ -1410,7 +1410,7 @@ progress_end_cb(GWEN_GUI *gwen_gui, guint32 id)
}
static gint GNC_GWENHYWFAR_CB
-#if GWENHYWFAR_VERSION_INT <= 49900
+#if GWENHYWFAR_VERSION_INT < 49900
getpassword_cb(GWEN_GUI *gwen_gui, guint32 flags, const gchar *token,
const gchar *title, const gchar *text, gchar *buffer,
gint min_len, gint max_len, guint32 guiid)
Summary of changes:
CMakeLists.txt | 4 ++++
borrowed/CMakeLists.txt | 2 +-
gnucash/import-export/aqb/gnc-gwen-gui.c | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
More information about the gnucash-changes
mailing list