r19446 - gnucash/trunk - Add lookup of linker flags of libgwenhyfar-gui-gtk2.
Christian Stimming
cstim at code.gnucash.org
Tue Aug 17 17:30:17 EDT 2010
Author: cstim
Date: 2010-08-17 17:30:17 -0400 (Tue, 17 Aug 2010)
New Revision: 19446
Trac: http://svn.gnucash.org/trac/changeset/19446
Modified:
gnucash/trunk/configure.ac
gnucash/trunk/src/import-export/aqbanking/Makefile.am
gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c
Log:
Add lookup of linker flags of libgwenhyfar-gui-gtk2.
It is still disabled until more testing has been done, though.
Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac 2010-08-17 21:05:40 UTC (rev 19445)
+++ gnucash/trunk/configure.ac 2010-08-17 21:30:17 UTC (rev 19446)
@@ -766,6 +766,8 @@
AC_MSG_ERROR([Could not find aqbanking > 1.6.0. If you use --enable-aqbanking or --enable-hbci, you *have* to have aqbanking installed!])
])
])
+ # For libgwenhywfar > 3.99.20, look for its library gwengui-gtk2.
+ PKG_CHECK_MODULES([GWENGUI_GTK2], [gwengui-gtk2 gwenhywfar], [has_gwengui_gtk2=1], [has_gwengui_gtk2=0])
# also check for ktoblzcheck
AC_CHECK_HEADERS(ktoblzcheck.h)
Modified: gnucash/trunk/src/import-export/aqbanking/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/Makefile.am 2010-08-17 21:05:40 UTC (rev 19445)
+++ gnucash/trunk/src/import-export/aqbanking/Makefile.am 2010-08-17 21:30:17 UTC (rev 19446)
@@ -45,6 +45,7 @@
${GNOME_LIBS} \
${GLADE_LIBS} \
${GLIB_LIBS} \
+ ${GWENGUI_GTK2_LIBS} \
${AQBANKING_LIBS}
AM_CFLAGS = \
Modified: gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c 2010-08-17 21:05:40 UTC (rev 19445)
+++ gnucash/trunk/src/import-export/aqbanking/gnc-gwen-gui.c 2010-08-17 21:30:17 UTC (rev 19446)
@@ -47,17 +47,15 @@
#if GWENHYWFAR_VERSION_INT > 39913
/* Only for the brave: You can enable the gwenhywfar gtk2 gui object
- * by un-commenting this here. Note: Also need to add "-lgwengui-gtk2"
- * to the LIBADD section in Makefile.am because that library can't be
- * looked up automatically so far! */
+ * by un-commenting this here. */
/*# define USING_GWENHYWFAR_GTK2_GUI*/
#endif
#ifdef USING_GWENHYWFAR_GTK2_GUI
-# if GWENHYWFAR_VERSION_INT < 39920
-# include <../gwen-gui-gtk2/gtk2_gui.h>
-# else
+# if GWENHYWFAR_VERSION_INT >= 39920
# include <gwen-gui-gtk2/gtk2_gui.h>
+# else
+# error "You must be using libgwenhywfar >= 3.99.20 because otherwise the -lgwengui-gtk2 is not added into the linker flags"
# endif
#endif
More information about the gnucash-changes
mailing list