From 9c0e54444f723ae834c2aa3ff03df38b9fab88ce Mon Sep 17 00:00:00 2001
From: Derek Atkins <derek@ihtfp.com>
Date: Mon, 30 Sep 2002 18:29:00 +0000
Subject: [PATCH] 	* get (alpha) qif-io-core to load again and "make
 check" to 	  start working (sort-of).  Still needs more work.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7252 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 ChangeLog                                     |  4 +++
 .../qif-io-core/gncmod-qifiocore.c            |  2 +-
 .../qif-io-core/test/Makefile.am              | 28 ++++++++++++++++---
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 04a9c3ead1..ba3ab738bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-30  Derek Atkins <derek@ihtfp.com>
+	* get (alpha) qif-io-core to load again and "make check" to
+	  start working (sort-of).  Still needs more work.
+
 2002-09-29  Joshua Sled  <jsled@asynchronous.org>
 
 	* src/backend/file/io-gncxml-v2.c
diff --git a/src/import-export/qif-io-core/gncmod-qifiocore.c b/src/import-export/qif-io-core/gncmod-qifiocore.c
index 4193bc0c3f..51f2d1d46f 100644
--- a/src/import-export/qif-io-core/gncmod-qifiocore.c
+++ b/src/import-export/qif-io-core/gncmod-qifiocore.c
@@ -50,7 +50,7 @@ libgncmod_qifiocore_LTX_gnc_module_init(int refcount) {
   }
 
   /* load the QIF Scheme code */
-  if(gh_eval_str("(use-modules (gnucash qif-io core))") ==
+  if(gh_eval_str("(use-modules (gnucash import-export qif-io-core))") ==
      SCM_BOOL_F) {
     return FALSE;
   }
diff --git a/src/import-export/qif-io-core/test/Makefile.am b/src/import-export/qif-io-core/test/Makefile.am
index 5e695796e5..7244199316 100644
--- a/src/import-export/qif-io-core/test/Makefile.am
+++ b/src/import-export/qif-io-core/test/Makefile.am
@@ -5,8 +5,28 @@ AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
 TESTS=test-load-module test-parser test-reader test-file-formats \
 test-import-phase-1
 
-TESTS_ENVIRONMENT = \
-  GNC_MODULE_PATH="${top_srcdir}/src/modules/qif-io-core:${top_srcdir}/src/modules/engine" \
-  GUILE_LOAD_PATH="../:../../engine/:../../../gnc-module/:${G_WRAP_MODULE_DIR}" \
-  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/app-utils:${top_srcdir}/src/app-utils/.libs
+GNC_TEST_DEPS := \
+  --gnc-module-dir ${top_builddir}/src/gnc-module \
+  --gnc-module-dir ${top_builddir}/src/engine \
+  --gnc-module-dir ${top_builddir}/src/app-utils \
+  --gnc-module-dir ${top_builddir}/src/calculation \
+  --gnc-module-dir ${top_builddir}/src/import-export/qif-io-core \
+  --guile-load-dir ${top_srcdir}/src/import-export/qif-io-core/test \
+  --guile-load-dir ${top_srcdir}/lib \
+  --guile-load-dir ${G_WRAP_MODULE_DIR} \
+  --guile-load-dir ${top_builddir}/src/gnome-utils \
+  --guile-load-dir ${top_builddir}/src/gnome \
+  --guile-load-dir ${top_builddir}/src/scm \
+  --library-dir    ${top_builddir}/src/gnome-utils \
+  --library-dir    ${top_srcdir}/src/gnome \
+  --library-dir    ${G_WRAP_LIB_DIR}
+
+TESTS_ENVIRONMENT := \
+  SRCDIR=${srcdir} \
+  $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
+
+#TESTS_ENVIRONMENT = \
+#  GNC_MODULE_PATH="${top_srcdir}/src/modules/qif-io-core:${top_srcdir}/src/modules/engine" \
+#  GUILE_LOAD_PATH="../:../../engine/:../../../gnc-module/:${G_WRAP_MODULE_DIR}" \
+#  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/app-utils:${top_srcdir}/src/app-utils/.libs