r18995 - gnucash/trunk - Remove local srfi's and require guile 1.6.7 or better.

Geert Janssens gjanssens at code.gnucash.org
Mon Apr 5 12:48:09 EDT 2010 

Author: gjanssens
Date: 2010-04-05 12:48:09 -0400 (Mon, 05 Apr 2010)
New Revision: 18995
Trac: http://svn.gnucash.org/trac/changeset/18995

Removed:
   gnucash/trunk/lib/srfi/
Modified:
   gnucash/trunk/configure.in
   gnucash/trunk/lib/Makefile.am
   gnucash/trunk/src/app-utils/test/Makefile.am
   gnucash/trunk/src/bin/overrides/Makefile.am
   gnucash/trunk/src/engine/Makefile.am
   gnucash/trunk/src/gnome-utils/test/Makefile.am
   gnucash/trunk/src/import-export/qif/test/Makefile.am
   gnucash/trunk/src/import-export/test/Makefile.am
   gnucash/trunk/src/report/locale-specific/us/test/Makefile.am
   gnucash/trunk/src/report/report-gnome/test/Makefile.am
   gnucash/trunk/src/report/report-system/test/Makefile.am
   gnucash/trunk/src/report/standard-reports/test/Makefile.am
   gnucash/trunk/src/report/stylesheets/test/Makefile.am
   gnucash/trunk/src/report/utility-reports/test/Makefile.am
Log:
Remove local srfi's and require guile 1.6.7 or better.
All now supported versions of guile come bundled with these
srfi's, so there's no need to keep our own copies.

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2010-04-05 14:48:22 UTC (rev 18994)
+++ gnucash/trunk/configure.in	2010-04-05 16:48:09 UTC (rev 18995)
@@ -343,11 +343,11 @@
 AS_SCRUB_INCLUDE(GUILE_INCS)
 AC_SUBST(GUILE_LIBS)
 
-AM_GUILE_VERSION_CHECK(1.6.0, , , [AC_MSG_ERROR([
+AM_GUILE_VERSION_CHECK(1.6.7, , , [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?  Gnucash requires at least version 1.6 to build.
+  development packages?  Gnucash requires at least version 1.6.7 to build.
 ])])
 
 AC_SUBST(GUILE)
@@ -430,38 +430,7 @@
 CFLAGS="$GNC_OLDCFLAGS"
 LDFLAGS="$GNC_OLDLDFLAGS"
 
-
 ### --------------------------------------------------------------------------
-### Check which SRFIs we need.
-
-GNC_ADD_ON_SRFIS=""
-
-for f in ${srcdir}/lib/srfi/srfi-*.scm
-do
-  srfi=`echo $f | sed 's%.*/%%' | sed 's/.scm//'`
-  AC_MSG_CHECKING(if guile needs our copy of ${srfi})
-  if ${GUILE} -c "(debug-set! stack    200000) (use-modules (srfi ${srfi}))" > /dev/null 2>&1
-  then
-    AC_MSG_RESULT(no)
-  else
-    GNC_ADD_ON_SRFIS="${GNC_ADD_ON_SRFIS} ${srfi}.scm"
-    AC_MSG_RESULT(yes)
-  fi
-done
-
-AC_SUBST(GNC_ADD_ON_SRFIS)
-if test "x${GNC_ADD_ON_SRFIS}" != "x"
-then
- GNC_SRFI_LOAD_PATH="\${top_srcdir}/lib/"
- GNC_TEST_SRFI_LOAD_CMD="--guile-load-dir \${top_srcdir}/lib/"
-else
- GNC_SRFI_LOAD_PATH=""
- GNC_TEST_SRFI_LOAD_CMD=""
-fi
-AC_SUBST(GNC_SRFI_LOAD_PATH)
-AC_SUBST(GNC_TEST_SRFI_LOAD_CMD)
-
-### --------------------------------------------------------------------------
 ### See if we need guile-www
 
 gnc_have_guile_www=no
@@ -1372,7 +1341,6 @@
           intl-scm/Makefile
           lib/Makefile
           lib/guile-www/Makefile
-          lib/srfi/Makefile
           lib/libc/Makefile
           lib/stf/Makefile
           packaging/Makefile

Modified: gnucash/trunk/lib/Makefile.am
===================================================================
--- gnucash/trunk/lib/Makefile.am	2010-04-05 14:48:22 UTC (rev 18994)
+++ gnucash/trunk/lib/Makefile.am	2010-04-05 16:48:09 UTC (rev 18995)
@@ -1,5 +1,5 @@
-SUBDIRS = libc guile-www srfi stf
-DIST_SUBDIRS = libc guile-www srfi stf
+SUBDIRS = libc guile-www stf
+DIST_SUBDIRS = libc guile-www stf
 
 EXTRA_DIST = README
 

Modified: gnucash/trunk/src/app-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/test/Makefile.am	2010-04-05 14:48:22 UTC (rev 18994)
+++ gnucash/trunk/src/app-utils/test/Makefile.am	2010-04-05 16:48:09 UTC (rev 18995)
@@ -14,8 +14,7 @@
   ${top_builddir}/src/core-utils/gnc-gconf-utils.c \
   test-print-parse-amount.c
 
-GNC_TEST_DEPS = @GNC_TEST_SRFI_LOAD_CMD@ \
-  --gnc-module-dir ${top_builddir}/src/engine \
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/calculation \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --guile-load-dir ${top_builddir}/src/core-utils \

Modified: gnucash/trunk/src/bin/overrides/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/overrides/Makefile.am	2010-04-05 14:48:22 UTC (rev 18994)
+++ gnucash/trunk/src/bin/overrides/Makefile.am	2010-04-05 16:48:09 UTC (rev 18995)
@@ -43,7 +43,6 @@
 gnucash-build-env: gnucash-build-env.in ${top_builddir}/config.status Makefile
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
-            -e 's#@-GNC_TEST_SRFI_LOAD_CMD-@#@GNC_TEST_SRFI_LOAD_CMD@#g' \
             -e 's#@-GNC_BUILDDIR-@#${PWD}/${top_builddir}#g' \
             -e 's#@-GNC_SRCDIR-@#${PWD}/${top_srcdir}#g'
 	mv $@.tmp $@

Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am	2010-04-05 14:48:22 UTC (rev 18994)
+++ gnucash/trunk/src/engine/Makefile.am	2010-04-05 16:48:09 UTC (rev 18995)
@@ -166,7 +166,7 @@
 
 iso-4217-currencies.c: iso-4217-currencies.scm iso-currencies-to-c
 	-chmod u+x ${srcdir}/iso-currencies-to-c
-	GUILE_LOAD_PATH=@GNC_SRFI_LOAD_PATH@:${GUILE_LOAD_PATH} srcdir=${srcdir} ${srcdir}/iso-currencies-to-c
+	srcdir=${srcdir} ${srcdir}/iso-currencies-to-c
 
 BUILT_SOURCES = iso-4217-currencies.c
 

Modified: gnucash/trunk/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/test/Makefile.am	2010-04-05 14:48:22 UTC (rev 18994)
+++ gnucash/trunk/src/gnome-utils/test/Makefile.am	2010-04-05 16:48:09 UTC (rev 18995)
@@ -8,8 +8,7 @@
 
 ##lib_LTLIBRARIES = libgncgnome.la
 
-GNC_TEST_DEPS = @GNC_TEST_SRFI_LOAD_CMD@ \
-  --gnc-module-dir ${top_builddir}/src/engine \
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/gnome-utils \
   --guile-load-dir ${top_builddir}/src/gnc-module \
   --guile-load-dir ${top_builddir}/src/engine \

Modified: gnucash/trunk/src/import-export/qif/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif/test/Makefile.am	2010-04-05 14:48:22 UTC (rev 18994)
+++ gnucash/trunk/src/import-export/qif/test/Makefile.am	2010-04-05 16:48:09 UTC (rev 18995)
@@ -22,8 +22,7 @@
   test-link \
   test-qif
 
-GNC_TEST_DEPS = @GNC_TEST_SRFI_LOAD_CMD@ \
-  --gnc-module-dir ${top_builddir}/src/core-utils \
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/core-utils \
   --gnc-module-dir ${top_builddir}/src/gnc-module \
   --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/app-utils \

Modified: gnucash/trunk/src/import-export/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/test/Makefile.am	2010-04-05 14:48:22 UTC (rev 18994)
+++ gnucash/trunk/src/import-export/test/Makefile.am	2010-04-05 16:48:09 UTC (rev 18995)
@@ -22,8 +22,7 @@
   test-link \
   test-import-parse
 
-GNC_TEST_DEPS = @GNC_TEST_SRFI_LOAD_CMD@ \
-  --gnc-module-dir ${top_builddir}/src/engine \
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/import-export \
   --guile-load-dir ${top_builddir}/src/engine \
   --library-dir    ${top_builddir}/lib/libqof/qof \

Modified: gnucash/trunk/src/report/locale-specific/us/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/locale-specific/us/test/Makefile.am	2010-04-05 14:48:22 UTC (rev 18994)
+++ gnucash/trunk/src/report/locale-specific/us/test/Makefile.am	2010-04-05 16:48:09 UTC (rev 18995)
@@ -1,7 +1,6 @@
 TESTS = test-link-module
 
-GNC_TEST_DEPS = @GNC_TEST_SRFI_LOAD_CMD@ \
-  --gnc-module-dir ${top_builddir}/src/engine \
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/tax/us \
   --gnc-module-dir ${top_builddir}/src/report/report-system \
   --gnc-module-dir ${top_builddir}/src/report/locale-specific/us \

Modified: gnucash/trunk/src/report/report-gnome/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/test/Makefile.am	2010-04-05 14:48:22 UTC (rev 18994)
+++ gnucash/trunk/src/report/report-gnome/test/Makefile.am	2010-04-05 16:48:09 UTC (rev 18995)
@@ -2,8 +2,7 @@
   test-link-module \
   test-load-module
 
-GNC_TEST_DEPS = @GNC_TEST_SRFI_LOAD_CMD@ \
-  --gnc-module-dir ${top_builddir}/src/engine \
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/app-utils \
   --gnc-module-dir ${top_builddir}/src/report/report-gnome \
   --guile-load-dir ${top_builddir}/src/gnc-module \

Modified: gnucash/trunk/src/report/report-system/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/test/Makefile.am	2010-04-05 14:48:22 UTC (rev 18994)
+++ gnucash/trunk/src/report/report-system/test/Makefile.am	2010-04-05 16:48:09 UTC (rev 18995)
@@ -2,8 +2,7 @@
   test-link-module \
   test-load-module
 
-GNC_TEST_DEPS = @GNC_TEST_SRFI_LOAD_CMD@ \
-  --gnc-module-dir ${top_builddir}/src/engine \
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/report/report-system \
   --guile-load-dir ${top_builddir}/src/gnc-module \
   --guile-load-dir ${top_builddir}/src/engine \

Modified: gnucash/trunk/src/report/standard-reports/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/standard-reports/test/Makefile.am	2010-04-05 14:48:22 UTC (rev 18994)
+++ gnucash/trunk/src/report/standard-reports/test/Makefile.am	2010-04-05 16:48:09 UTC (rev 18995)
@@ -1,7 +1,6 @@
 TESTS=test-load-module
 
-GNC_TEST_DEPS = @GNC_TEST_SRFI_LOAD_CMD@ \
-  --gnc-module-dir ${top_builddir}/src/engine \
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/report/report-system \
   --gnc-module-dir ${top_builddir}/src/report/standard-reports \
   --guile-load-dir ${top_builddir}/src/gnc-module \

Modified: gnucash/trunk/src/report/stylesheets/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/stylesheets/test/Makefile.am	2010-04-05 14:48:22 UTC (rev 18994)
+++ gnucash/trunk/src/report/stylesheets/test/Makefile.am	2010-04-05 16:48:09 UTC (rev 18995)
@@ -1,7 +1,6 @@
 TESTS=test-load-module
 
-GNC_TEST_DEPS = @GNC_TEST_SRFI_LOAD_CMD@ \
-  --gnc-module-dir ${top_builddir}/src/engine \
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/report/report-system \
   --gnc-module-dir ${top_builddir}/src/report/stylesheets \
   --guile-load-dir ${top_builddir}/src/gnc-module \

Modified: gnucash/trunk/src/report/utility-reports/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/utility-reports/test/Makefile.am	2010-04-05 14:48:22 UTC (rev 18994)
+++ gnucash/trunk/src/report/utility-reports/test/Makefile.am	2010-04-05 16:48:09 UTC (rev 18995)
@@ -1,7 +1,6 @@
 TESTS = test-load-module
 
-GNC_TEST_DEPS = @GNC_TEST_SRFI_LOAD_CMD@ \
-  --gnc-module-dir ${top_builddir}/src/engine \
+GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --gnc-module-dir ${top_builddir}/src/report/report-system \
   --gnc-module-dir ${top_builddir}/src/report/utility-reports \
   --guile-load-dir ${top_builddir}/src/gnc-module \

More information about the gnucash-changes mailing list