Start binary-import test module.

Move xml-i18n-tools higher in configure.in.
Configure register-core module.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5387 57a11ea4-9604-0410-9ed3-97b8803252fd

Makefile.am

@@ -82,7 +82,9 @@ gnucash-config: gnucash-config.in
             -e 's:@-GNUCASH_NETWORK_UTILS_CFLAGS-@:${GNUCASH_NETWORK_UTILS_CFLAGS}:g' \
             -e 's:@-GNUCASH_NETWORK_UTILS_LIBS-@:${GNUCASH_NETWORK_UTILS_LIBS}:g' \
             -e 's:@-GNUCASH_GNOME_UTILS_CFLAGS-@:${GNUCASH_GNOME_UTILS_CFLAGS}:g' \
-            -e 's:@-GNUCASH_GNOME_UTILS_LIBS-@:${GNUCASH_GNOME_UTILS_LIBS}:g'
+            -e 's:@-GNUCASH_GNOME_UTILS_LIBS-@:${GNUCASH_GNOME_UTILS_LIBS}:g' \
+            -e 's:@-GNUCASH_REGISTER_CORE_CFLAGS-@:${GNUCASH_REGISTER_CORE_CFLAGS}:g' \
+            -e 's:@-GNUCASH_REGISTER_CORE_LIBS-@:${GNUCASH_REGISTER_CORE_LIBS}:g'
 	chmod +x $@.tmp
 	mv $@.tmp $@
 

configure.in

@@ -41,6 +41,12 @@ AC_DEFINE_UNQUOTED(GNUCASH_MAJOR_VERSION, $GNUCASH_MAJOR_VERSION)
 AC_DEFINE_UNQUOTED(GNUCASH_MINOR_VERSION, $GNUCASH_MINOR_VERSION)
 AC_DEFINE_UNQUOTED(GNUCASH_MICRO_VERSION, $GNUCASH_MICRO_VERSION)
 
+dnl Set of available languages.
+ALL_LINGUAS="da de en_GB es fr it ja no pt_PT ru sv"
+AM_GNU_GETTEXT
+
+AM_PROG_XML_I18N_TOOLS
+
 AC_CANONICAL_HOST
 AM_MAINTAINER_MODE
 AM_ACLOCAL_INCLUDE(macros)
@@ -101,12 +107,6 @@ GNOME_XML_CHECK
 #  AC_DEFINE(HAVE_XML_VERSION_HEADER)
 #])
 
-dnl Set of available languages.
-ALL_LINGUAS="da de en_GB es fr it ja no pt_PT ru sv"
-AM_GNU_GETTEXT
-
-AM_PROG_XML_I18N_TOOLS
-
 
 ### --------------------------------------------------------------------------
 ### Variables
@@ -667,6 +667,12 @@ GNUCASH_GNOME_UTILS_LIBS="${GNUCASH_APP_UTILS_LIBS} ${GNUCASH_NETWORK_UTILS_LIBS
 AC_SUBST(GNUCASH_GNOME_UTILS_CFLAGS)
 AC_SUBST(GNUCASH_GNOME_UTILS_LIBS)
 
+GNUCASH_REGISTER_CORE_CFLAGS="${GNUCASH_GNOME_UTILS_CFLAGS}"
+GNUCASH_REGISTER_CORE_LIBS="${GNUCASH_GNOME_UTILS_LIBS} -lgncmod-register-core"
+
+AC_SUBST(GNUCASH_REGISTER_CORE_CFLAGS)
+AC_SUBST(GNUCASH_REGISTER_CORE_LIBS)
+
 
 ### --------------------------------------------------------------------------
 ### Makefile creation
@@ -742,6 +748,7 @@ AC_OUTPUT(
           src/guile/Makefile
           src/import-export/Makefile
           src/import-export/binary-import/Makefile
+          src/import-export/binary-import/test/Makefile
           src/import-export/qif-import/Makefile
           src/import-export/qif-io-core/Makefile
           src/import-export/qif-io-core/test/Makefile

gnucash-config.in

@@ -16,8 +16,9 @@ Options:
 	[--cflags]
 Libraries:
 	engine
-        app-utils
         network-utils
+        app-utils
+        register-core
         gnome-utils
         gnucash
 EOF
@@ -79,6 +80,10 @@ while test $# -gt 0; do
       lib_gnome_utils=yes
       any_lib=yes
       ;;
+    register-core)
+      lib_register_core=yes
+      any_lib=yes
+      ;;
     gnucash)
       lib_gnucash=yes
       any_lib=yes
@@ -91,6 +96,8 @@ while test $# -gt 0; do
 done
 
 
+# Trim the link and compile lines down.
+
 if test "$any_lib" = "no"; then
   lib_gnucash=yes
 fi
@@ -99,15 +106,25 @@ if test "$lib_app_utils" = "yes"; then
   lib_engine=no
 fi
 
-if test "$lib_gnucash" = "yes"; then
+if test "$lib_register_core" = "yes"; then
   lib_engine=no
+  lib_network_utils=no
   lib_app_utils=no
+  lib_gnome_utils=no
 fi
 
 if test "$lib_gnome_utils" = "yes"; then
   lib_engine=no
-  lib_app_utils=no
   lib_network_utils=no
+  lib_app_utils=no
+fi
+
+if test "$lib_gnucash" = "yes"; then
+  lib_engine=no
+  lib_network_utils=no
+  lib_app_utils=no
+  lib_register_core=no
+  lib_gnome_utils=no
 fi
 
 if test "$echo_prefix" = "yes"; then
@@ -125,12 +142,16 @@ if test "$echo_cflags" = "yes"; then
         cflags="$cflags @-GNUCASH_ENGINE_CFLAGS-@"
     fi
 
+    if test "$lib_network_utils" = "yes"; then
+        cflags="$cflags @-GNUCASH_NETWORK_UTILS_CFLAGS-@"
+    fi
+
     if test "$lib_app_utils" = "yes"; then
         cflags="$cflags @-GNUCASH_APP_UTILS_CFLAGS-@"
     fi
 
-    if test "$lib_network_utils" = "yes"; then
+    if test "$lib_register_core" = "yes"; then
-        cflags="$cflags @-GNUCASH_NETWORK_UTILS_CFLAGS-@"
+        cflags="$cflags @-GNUCASH_REGISTER_CORE_CFLAGS-@"
     fi
 
     if test "$lib_gnome_utils" = "yes"; then
@@ -147,12 +168,16 @@ if test "$echo_libs" = "yes"; then
         libs="$libs @-GNUCASH_ENGINE_LIBS-@"
     fi
 
+    if test "$lib_network_utils" = "yes"; then
+        libs="$libs @-GNUCASH_NETWORK_UTILS_LIBS-@"
+    fi
+
     if test "$lib_app_utils" = "yes"; then
         libs="$libs @-GNUCASH_APP_UTILS_LIBS-@"
     fi
 
-    if test "$lib_network_utils" = "yes"; then
+    if test "$lib_register_core" = "yes"; then
-        libs="$libs @-GNUCASH_NETWORK_UTILS_LIBS-@"
+        libs="$libs @-GNUCASH_REGISTER_CORE_LIBS-@"
     fi
 
     if test "$lib_gnome_utils" = "yes"; then

src/import-export/binary-import/Makefile.am

@@ -1,4 +1,5 @@
 SUBDIRS = . #test
+DIST_SUBDIRS = test
 
 pkglib_LTLIBRARIES = libgncmod-binary-import.la
 

src/import-export/binary-import/druid-commodity.c

@@ -33,17 +33,17 @@
 
 #include "FileDialog.h"
 #include "Scrub.h"
+#include "dialog-commodity.h"
 #include "dialog-utils.h"
 #include "druid-commodity.h"
 #include "druid-utils.h"
-#include "dialog-commodity.h"
 #include "gnc-commodity.h"
+#include "gnc-engine-util.h"
 #include "gnc-engine.h"
 #include "gnc-gui-query.h"
-#include "gnc-ui.h"
 #include "gnc-pricedb-p.h"
-
+#include "gnc-ui-util.h"
-#include "gnc-engine-util.h"
+#include "gnc-ui.h"
 
 /* This static indicates the debugging module that this .o belongs to.  */
 static short module = MOD_GUI;
@@ -442,7 +442,7 @@ finish_helper(gpointer key, gpointer value, gpointer data) {
   gnc_commodity  * old_comm = g_hash_table_lookup(cd->old_map, key);
   GList          * accts;
   GList          * node;
-  GNCBook        * book = gncGetCurrentBook();
+  GNCBook        * book = xaccGroupGetBook (gnc_get_current_group ());
 
   if(!book) {
     PERR("finish_helper - no current book.");
@@ -459,7 +459,7 @@ finish_helper(gpointer key, gpointer value, gpointer data) {
 				   comm);
 
   /* now replace all the accounts using old_comm with new_comm */
-  accts = xaccGroupGetSubAccounts(gncGetCurrentGroup());
+  accts = xaccGroupGetSubAccounts(gnc_get_current_group ());
 
   for(node = accts; node; node = node->next) {
     Account *account = node->data;
@@ -491,10 +491,10 @@ gnc_ui_commodity_druid_finish_cb(GnomeDruidPage * page, gpointer druid,
   g_hash_table_foreach(cd->new_map, &finish_helper, (gpointer)cd);
 
   /* Fix account and transaction commodities */
-  xaccGroupScrubCommodities (gncGetCurrentGroup());
+  xaccGroupScrubCommodities (gnc_get_current_group ());
 
   /* Fix split amount/value */
-  xaccGroupScrubSplits (gncGetCurrentGroup());
+  xaccGroupScrubSplits (gnc_get_current_group ());
 
   /* destroy the dialog */
   gnc_ui_commodity_druid_destroy(cd);

src/import-export/binary-import/test/.cvsignore

@@ -0,0 +1,5 @@
+Makefile
+Makefile.in
+.deps
+.libs
+test-link-module

src/import-export/binary-import/test/Makefile.am

@@ -0,0 +1,38 @@
+TESTS =  \
+  test-link-module
+#  test-load-module
+
+TESTS_ENVIRONMENT= \
+   GNC_MODULE_PATH=../../engine:../../gnc-module:../../calculation:.. \
+   GUILE_LOAD_PATH=${G_WRAP_MODULE_DIR}:../../engine:..:../../gnc-module:${top_srcdir}/lib \
+   LTDL_LIBRARY_PATH=.. \
+   LD_LIBRARY_PATH=${top_srcdir}/src/gnc-module:${top_srcdir}/src/gnc-module/.libs:${top_srcdir}/src/engine:${top_srcdir}/src/engine/.libs:${top_srcdir}/src/calculation:${top_srcdir}/src/calculation/.libs
+
+LDADD = \
+  -L${top_srcdir}/src/gnc-module -L${top_srcdir}/src/gnc-module/.libs \
+  -L${top_srcdir}/src/engine -L${top_srcdir}/src/engine/.libs \
+  -L${top_srcdir}/src/calculation -L${top_srcdir}/src/calculation/.libs \
+  -L${top_srcdir}/src/network-utils -L${top_srcdir}/src/network-utils/.libs \
+  -L${top_srcdir}/src/app-utils -L${top_srcdir}/src/app-utils/.libs \
+  -L${top_srcdir}/src/gnome-utils -L${top_srcdir}/src/gnome-utils/.libs \
+   ${top_srcdir}/src/gnc-module/libgncmodule.la \
+   ${top_srcdir}/src/engine/libgncmod-engine.la \
+   ${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
+   ${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
+   ../libgncmod-binary-import.la \
+   ${top_srcdir}/src/engine/libgw-engine.la \
+   ${top_srcdir}/src/engine/libgw-glib.la \
+   ${top_srcdir}/src/test-core/libgncmod-test.la \
+   ${top_srcdir}/src/engine/test-core/libgncmod-test-engine.la \
+  -lltdl
+
+bin_PROGRAMS = \
+  test-link-module
+
+#EXTRA_DIST = test-load-module
+
+INCLUDES = \
+  -I${top_srcdir}/src/test-core \
+  -I..
+
+CFLAGS = @CFLAGS@ ${GLIB_CFLAGS}

src/import-export/binary-import/test/test-link-module.c

@@ -0,0 +1,6 @@
+#include <stdlib.h>
+
+int
+main(int argc, char ** argv) {
+  exit(0);
+}