From 1959fb04dc4608206bdcc6908ca3f0d71a43eda8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 17 Jul 2013 11:05:19 +0200 Subject: build: Provide a replacement (srfi srfi-37) when the user's one is broken. * srfi/srfi-37.scm.in: New file, taken from Guile 2.0.9. * m4/guix.m4: New macro. * configure.ac: Use it. Define Automake conditional `INSTALL_SRFI_37'. * Makefile.am (nobase_nodist_guilemodule_DATA)[INSTALL_SRFI_37]: Add srfi/srfi-37.scm. (GOBJECTS)[INSTALL_SRFI_37]: Add srfi/srfi-37.go. (srfi/srfi-37.scm)[INSTALL_SRFI_37]: New target. (EXTRA_DIST): Add srfi/srfi-37.scm.in. --- Makefile.am | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index ecda21c77f..ed3607300f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -74,12 +74,24 @@ MODULES = \ # first to avoid errors on systems where (gnutls) is unavailable. guix/scripts/download.go: guix/build/download.go + GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go nobase_dist_guilemodule_DATA = $(MODULES) +nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm +# Do we need to provide our own non-broken (srfi srfi-37) module? +if INSTALL_SRFI_37 + +nobase_nodist_guilemodule_DATA += srfi/srfi-37.scm +GOBJECTS += srfi/srfi-37.go + +srfi/srfi-37.scm: srfi/srfi-37.scm.in + $(MKDIR_P) srfi + cp "$<" "$@" + +endif INSTALL_SRFI_37 -nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm SCM_TESTS = \ tests/base32.scm \ @@ -133,6 +145,7 @@ EXTRA_DIST = \ build-aux/download.scm \ build-aux/list-packages.scm \ build-aux/sync-synopses.scm \ + srfi/srfi-37.scm.in \ srfi/srfi-64.scm \ srfi/srfi-64.upstream.scm \ tests/test.drv \ -- cgit v1.2.3