IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2026-09-03 20:53:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't build borrowed/gwengui-gtk3 if its provided by gwenhywfar.

Browse Source
This commit is contained in:
John Ralls
2017-12-22 10:26:31 -08:00
parent e0300d3a62
commit 6e9025d2f9
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+4
View File
@@ -319,6 +319,10 @@ IF (WITH_AQBANKING)
IF(KTOBLZCHECK_FOUND) IF(KTOBLZCHECK_FOUND)
SET(HAVE_KTOBLZCHECK_H 1) SET(HAVE_KTOBLZCHECK_H 1)
ENDIF(KTOBLZCHECK_FOUND) 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_GNUCASH)
ENDIF (WITH_AQBANKING) ENDIF (WITH_AQBANKING)
borrowed/CMakeLists.txt
+1 -1
View File
@@ -1,6 +1,6 @@
ADD_SUBDIRECTORY(libc) ADD_SUBDIRECTORY(libc)
ADD_SUBDIRECTORY(goffice) ADD_SUBDIRECTORY(goffice)
if (WITH_AQBANKING) if (WITH_AQBANKING AND NOT HAVE_GWEN_GTK3)
ADD_SUBDIRECTORY(gwengui-gtk3) ADD_SUBDIRECTORY(gwengui-gtk3)
endif() endif()
SET_LOCAL_DIST(borrowed_DIST_local CMakeLists.txt Makefile.am README) SET_LOCAL_DIST(borrowed_DIST_local CMakeLists.txt Makefile.am README)
gnucash/import-export/aqb/gnc-gwen-gui.c
+2 -2
View File
@@ -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, static gint progress_log_cb(GWEN_GUI *gwen_gui, guint32 id,
GWEN_LOGGER_LEVEL level, const gchar *text); GWEN_LOGGER_LEVEL level, const gchar *text);
static gint progress_end_cb(GWEN_GUI *gwen_gui, guint32 id); 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, static gint GNC_GWENHYWFAR_CB getpassword_cb(GWEN_GUI *gwen_gui, guint32 flags,
const gchar *token, const gchar *token,
const gchar *title, const gchar *title,
@@ -1410,7 +1410,7 @@ progress_end_cb(GWEN_GUI *gwen_gui, guint32 id)
} }
static gint GNC_GWENHYWFAR_CB 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, getpassword_cb(GWEN_GUI *gwen_gui, guint32 flags, const gchar *token,
const gchar *title, const gchar *text, gchar *buffer, const gchar *title, const gchar *text, gchar *buffer,
gint min_len, gint max_len, guint32 guiid) gint min_len, gint max_len, guint32 guiid)