/tmp/cvs7Cckh1

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

ChangeLog

@@ -1,3 +1,15 @@
+2003-01-15  David Hampton  <hampton@employees.org>
+
+	* configure.in: Remove restriction on guile versions > 1.4.
+	Provide a version dependant load path variable for the SRFI
+	location. (Empty in 1.6 since they're bundled with guile.)
+
+	* src/engine/Makefile.am: Don't hard code the location of the
+	SRFIs into the guilel load path.
+
+	* src/import-export/qif-import/qif-file.scm: The rdelim module
+	moved locations in guile 1.6
+
 2003-01-15  John H. Pierce <john@killterm.org>
 
 	* Makefile.am:
@@ -28,7 +40,8 @@
 	* src/register/register-core/Makefile.am:
 	* src/report/report-gnome/Makefile.am: Changes to make the build
 	system work on multiple architectures and with multiple versions
-	of the autotools suite.
+	of the autotools suite.  Make generated g-wrap sources depend on
+	config.status.
 
 	* Makefile.DEPS:
 	* src/bin/strsub.c: New files needed for automake 1.4.  These can

configure.in

@@ -150,12 +150,12 @@ AS_SCRUB_INCLUDE(GUILE_INCS)
 G_WRAP_COMPILE_ARGS=""
 G_WRAP_LINK_ARGS=""
 
-AM_GUILE_VERSION_CHECK(1.3.4, 1.5.0, , [AC_MSG_ERROR([
+AM_GUILE_VERSION_CHECK(1.3.4, , , [AC_MSG_ERROR([
 
   guile  does not appear to be installed correctly, or is not in the
   correct version range.  Perhaps you have not installed the guile
   development packages?  Right now gnucash requires at least version
-  1.3.4 to build, but does not work with 1.5 or greater.
+  1.3.4 to build.
 ])])
 
 AM_PATH_GWRAP(1.3.3, , , [AC_MSG_ERROR([
@@ -252,6 +252,13 @@ do
 done
 
 AC_SUBST(GNC_ADD_ON_SRFIS)
+if test "x${GNC_ADD_ON_SRFIS}" != "x"
+then
+ GNC_SRFI_LOAD_PATH="\${top_srcdir}/lib/"
+else
+ GNC_SRFI_LOAD_PATH=""
+fi
+AC_SUBST(GNC_SRFI_LOAD_PATH)
 
 ### --------------------------------------------------------------------------
 ### See if we need guile-www

src/engine/Makefile.am

@@ -170,7 +170,7 @@ endif
 
 iso-4217-currencies.c: iso-4217-currencies.scm iso-currencies-to-c
 	-chmod u+x ${srcdir}/iso-currencies-to-c
-	GUILE_LOAD_PATH=${top_srcdir}/lib/:${GUILE_LOAD_PATH} srcdir=${srcdir} ${srcdir}/iso-currencies-to-c
+	GUILE_LOAD_PATH=@GNC_SRFI_LOAD_PATH@:${GUILE_LOAD_PATH} srcdir=${srcdir} ${srcdir}/iso-currencies-to-c
 
 gw-engine.scm gw-engine.c gw-engine.h: \
   .scm-links gw-engine-spec.scm ${top_builddir}/config.status

src/import-export/qif-import/qif-file.scm

@@ -12,6 +12,11 @@
 ;;  just store the fields "raw".
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(cond
+ ((or (string=? "1.3.4" (version))
+      (string=? "1.4" (substring (version) 0 3))) #f)
+ (else (use-modules (ice-9 rdelim))))
+
 (define (qif-file:read-file self path ticker-map)
   (false-if-exception
    (let* ((qstate-type #f)