From 196a4f8ac0f12d9193d14d9d9fa9ced8f9420b9c Mon Sep 17 00:00:00 2001
From: Ludovic Courtès
Date: Mon, 14 May 2012 23:45:38 +0200
Subject: Mention "Guile 2.0" instead of "Guile-VM".

* configure.ac: Remove `--enable-guile-vm' option.  Check for `guild'
  and `guile-tools', defining `GUILD'.  Rename `ENABLE_GUILE_VM' to
  `HAVE_GUILE2'.

* guile-vm.am: Rename to...
* guilec.am: ... this.

* doc/modules/Makefile.am, src/guile/Makefile.am: Update accordingly.
---
 guile-vm.am | 48 ------------------------------------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 guile-vm.am

(limited to 'guile-vm.am')

diff --git a/guile-vm.am b/guile-vm.am
deleted file mode 100644
index c64eda9..0000000
--- a/guile-vm.am
+++ /dev/null
@@ -1,48 +0,0 @@
-
-# Compilation with Guile-VM's compiler (aka. Guile 2.x).
-
-if ENABLE_GUILE_VM
-
-# XXX: This expression relies on a GNU extension.
-GOBJECTS = $(SOURCES:%.scm=%.go)
-
-nobase_dist_module_DATA = $(SOURCES) $(SOURCES_NOT_COMPILED)
-nobase_nodist_module_DATA = $(GOBJECTS)
-
-# Compiler warnings.
-guile_warnings =							\
-  unused-variable unused-toplevel unbound-variable arity-mismatch	\
-  format
-
-.scm.go:
-	$(MKDIR_P) `dirname $@`
-	GUILE_AUTO_COMPILE=0					\
-	GUILE_LOAD_COMPILED_PATH="$(builddir):$(top_builddir)/src/guile:$$GUILE_LOAD_COMPILED_PATH" \
-	$(GUILE) -L "$(srcdir)" -L "$(top_srcdir)/src/guile"	\
-	  -c "(use-modules (system base compile)		\
-	                   (system base message)		\
-	                   (skribilo condition))		\
-	      (with-fluids ((*current-warning-prefix* \"\"))	\
-		(call-with-skribilo-error-catch/exit		\
-		  (lambda ()					\
-		    (compile-file \"$<\" #:output-file \"$@\"	\
-				  #:opts '(#:warnings ($(guile_warnings)))))))"
-
-CLEANFILES += $(GOBJECTS)
-
-SUFFIXES += .go
-
-# Make sure source files are installed first, so that the mtime of
-# installed compiled files is greater than that of installed source
-# files.  See
-# <http://lists.gnu.org/archive/html/guile-devel/2010-07/msg00125.html>
-# for details.
-skr_install_go_files = install-nobase_nodist_moduleDATA
-$(skr_install_go_files): install-nobase_dist_moduleDATA
-
-else !ENABLE_GUILE_VM
-
-nobase_dist_module_DATA = $(SOURCES) $(SOURCES_NOT_COMPILED)
-nobase_nodist_module_DATA =
-
-endif !ENABLE_GUILE_VM
-- 
cgit v1.2.3